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

hide un and pw fields when user is social auth based

Browse Source
This commit is contained in:
John Mitchell
2015-11-16 11:18:08 -05:00
parent dfb056d200
commit 9bf0b8be4c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/controllers/Users.js
View File

@@ -307,6 +307,7 @@ export function UsersEdit($scope, $rootScope, $compile, $location, $log, $routeP
$scope.ldap_user = (data.ldap_dn !== null && data.ldap_dn !== undefined && data.ldap_dn !== '') ? true : false; $scope.ldap_user = (data.ldap_dn !== null && data.ldap_dn !== undefined && data.ldap_dn !== '') ? true : false;
$scope.not_ldap_user = !$scope.ldap_user; $scope.not_ldap_user = !$scope.ldap_user;
master.ldap_user = $scope.ldap_user; master.ldap_user = $scope.ldap_user;
$scope.socialAuthUser = (data.auth.length > 0) ? true : false;
// Initialize related search functions. Doing it here to make sure relatedSets object is populated. // Initialize related search functions. Doing it here to make sure relatedSets object is populated.
RelatedSearchInit({ RelatedSearchInit({

4
awx/ui/client/src/forms/Users.js
View File

@@ -84,7 +84,7 @@ export default
label: 'Password', label: 'Password',
type: 'sensitive', type: 'sensitive',
hasShowInputButton: true, hasShowInputButton: true,
ngShow: 'ldap_user == false', ngShow: 'ldap_user == false && socialAuthUser === false',
addRequired: true, addRequired: true,
editRequired: false, editRequired: false,
ngChange: "clearPWConfirm('password_confirm')", ngChange: "clearPWConfirm('password_confirm')",
@@ -95,7 +95,7 @@ export default
label: 'Confirm Password', label: 'Confirm Password',
type: 'sensitive', type: 'sensitive',
hasShowInputButton: true, hasShowInputButton: true,
ngShow: 'ldap_user == false', ngShow: 'ldap_user == false && socialAuthUser === false',
addRequired: true, addRequired: true,
editRequired: false, editRequired: false,
awPassMatch: true, awPassMatch: true,