External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Clear invalid password error if password field is completely cleared

Browse Source
This commit is contained in:
mabashian
2018-04-30 14:56:17 -04:00
parent 05556809d3
commit e45be8155e
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/users/add/users-add.controller.js
View File

@@ -109,10 +109,11 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
}; };
// Password change // Password change
$scope.clearPWConfirm = function(fld) { $scope.clearPWConfirm = function() {
// If password value changes, make sure password_confirm must be re-entered // If password value changes, make sure password_confirm must be re-entered
$scope[fld] = ''; $scope.password_confirm = '';
$scope[form.name + '_form'][fld].$setValidity('awpassmatch', false); let passValidity = (!$scope.password || $scope.password === '') ? true : false;
$scope[form.name + '_form'].password_confirm.$setValidity('awpassmatch', passValidity);
}; };
} }
]; ];

7
awx/ui/client/src/users/edit/users-edit.controller.js
View File

@@ -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 // If password value changes, make sure password_confirm must be re-entered
$scope[fld] = ''; $scope.password_confirm = '';
$scope[form.name + '_form'][fld].$setValidity('awpassmatch', false); let passValidity = (!$scope.password || $scope.password === '') ? true : false;
$scope[form.name + '_form'].password_confirm.$setValidity('awpassmatch', passValidity);
$rootScope.flashMessage = null; $rootScope.flashMessage = null;
}; };
} }

2
awx/ui/client/src/users/users.form.js
View File

@@ -76,7 +76,7 @@ export default ['i18n', function(i18n) {
reqExpression: "isAddForm", reqExpression: "isAddForm",
init: false init: false
}, },
ngChange: "clearPWConfirm('password_confirm')", ngChange: "clearPWConfirm()",
autocomplete: false, autocomplete: false,
ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)' ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
}, },