From 613fafff05aa4185cd405b096e04e3eddfd2ac97 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansibleworks.com>
Date: Fri, 12 Jul 2013 10:30:38 -0400
Subject: [PATCH] AC-198 Fixed the login page so that passwords and usernames
 are not remembered. The issue is scope variable name overlap. If
 scope.username or scope.password gets defined along the way, the value gets
 pushed into the login form.

---
 awx/ui/static/js/awx-min.js              |  2 +-
 awx/ui/static/partials/login-dialog.html | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/awx/ui/static/js/awx-min.js b/awx/ui/static/js/awx-min.js
index e7a3e9ffe6..7cdcbd79ec 100644
--- a/awx/ui/static/js/awx-min.js
+++ b/awx/ui/static/js/awx-min.js
@@ -4,7 +4,7 @@
  *
  *  awx-min.js
  *
- *  master-f2e5182, Thu Jul 11 23:28:39 2013 -0400
+ *  master-b32c0dc, Thu Jul 11 23:36:14 2013 -0400
  *
  */
 var urlPrefix="/static/";
diff --git a/awx/ui/static/partials/login-dialog.html b/awx/ui/static/partials/login-dialog.html
index 58d9965994..6f8e9432c2 100644
--- a/awx/ui/static/partials/login-dialog.html
+++ b/awx/ui/static/partials/login-dialog.html
@@ -11,29 +11,26 @@
             <div class="control-group">
               <label class="control-label">Username:</label>
               <div class="controls">
-                <input type="text" name="username" ng-model="username" id="login-username" autocomplete="off" required><br />
-                <span class="error" ng-show="loginForm.username.$dirty && loginForm.username.$error.required">A value is required!</span>
-                <span class="errora api-error" ng-bind="usernameError"></span>
+                <input type="text" name="login_username" ng-model="login_username" id="login-username" autocomplete="off" required><br />
+                <span class="error" ng-show="loginForm.login_username.$dirty && loginForm.login_username.$error.required">A value is required!</span>
+                <span class="error api-error" ng-bind="usernameError"></span>
               </div>
             </div>
             <div class="control-group">
               <label class="control-label">Password:</label>
               <div class="controls">
-                <input type="password" name="password" id="login-password" ng-model="password" autocomplete="off"><br />
-                <span class="error" ng-show="loginForm.password.$dirty && loginForm.password.$error.required">A value is required!</span>
+                <input type="password" name="login_password" id="login-password" ng-model="login_password" required autocomplete="off"><br />
+                <span class="error" ng-show="loginForm.login_password.$dirty && loginForm.login_password.$error.required">A value is required!</span>
                 <span class="error api-error" ng-bind="passwordError"></span>
               </div>
             </div>
           </form>
         </div>
         <div class="modal-footer">
-          <button ng-click="systemLogin(loginForm.username.$modelValue,loginForm.password.$modelValue)"
-                  ng-disabled="loginForm.$invalid || $loginForm.$pristine" 
+          <button ng-click="systemLogin(login_username, login_password)"
                   id="login-button" class="btn btn-primary">Sign In</button>
         </div>
       </div><!-- modal -->
       
     </div><!-- span -->
-  </div><!-- row -->
-
-  
\ No newline at end of file
+  </div><!-- row -->
\ No newline at end of file