From e45be8155ea9664416ea120a14d89137670d1658 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 30 Apr 2018 14:56:17 -0400
Subject: [PATCH] Clear invalid password error if password field is completely
 cleared

---
 awx/ui/client/src/users/add/users-add.controller.js   | 7 ++++---
 awx/ui/client/src/users/edit/users-edit.controller.js | 7 ++++---
 awx/ui/client/src/users/users.form.js                 | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/awx/ui/client/src/users/add/users-add.controller.js b/awx/ui/client/src/users/add/users-add.controller.js
index 081ae21a90..c822b7bf9d 100644
--- a/awx/ui/client/src/users/add/users-add.controller.js
+++ b/awx/ui/client/src/users/add/users-add.controller.js
@@ -109,10 +109,11 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
         };
 
         // Password change
-        $scope.clearPWConfirm = function(fld) {
+        $scope.clearPWConfirm = function() {
             // If password value changes, make sure password_confirm must be re-entered
-            $scope[fld] = '';
-            $scope[form.name + '_form'][fld].$setValidity('awpassmatch', false);
+            $scope.password_confirm = '';
+            let passValidity = (!$scope.password || $scope.password === '') ? true : false;
+            $scope[form.name + '_form'].password_confirm.$setValidity('awpassmatch', passValidity);
         };
     }
 ];
diff --git a/awx/ui/client/src/users/edit/users-edit.controller.js b/awx/ui/client/src/users/edit/users-edit.controller.js
index 82ae48af1d..f2294a1703 100644
--- a/awx/ui/client/src/users/edit/users-edit.controller.js
+++ b/awx/ui/client/src/users/edit/users-edit.controller.js
@@ -189,10 +189,11 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
             }
         };
 
-        $scope.clearPWConfirm = function(fld) {
+        $scope.clearPWConfirm = function() {
             // If password value changes, make sure password_confirm must be re-entered
-            $scope[fld] = '';
-            $scope[form.name + '_form'][fld].$setValidity('awpassmatch', false);
+            $scope.password_confirm = '';
+            let passValidity = (!$scope.password || $scope.password === '') ? true : false;
+            $scope[form.name + '_form'].password_confirm.$setValidity('awpassmatch', passValidity);
             $rootScope.flashMessage = null;
         };
     }
diff --git a/awx/ui/client/src/users/users.form.js b/awx/ui/client/src/users/users.form.js
index 93a1264edd..900e1995ef 100644
--- a/awx/ui/client/src/users/users.form.js
+++ b/awx/ui/client/src/users/users.form.js
@@ -76,7 +76,7 @@ export default ['i18n', function(i18n) {
                         reqExpression: "isAddForm",
                         init: false
                     },
-                    ngChange: "clearPWConfirm('password_confirm')",
+                    ngChange: "clearPWConfirm()",
                     autocomplete: false,
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },