External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 21:20:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Hide password fields for radius/social auth users

Browse Source 
on the users edit form, the password/confirm password field will be hidden similar to ldap. the username will not be required as well
This commit is contained in:
Jared Tabor
2016-06-29 11:13:56 -07:00
parent fe64b0b478
commit b99f9e2eee
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/legacy-styles/forms.less
View File

@@ -55,7 +55,10 @@
min-height: 40px; min-height: 40px;
} }
.Form-title--is_superuser, .Form-title--is_system_auditor, .Form-title--is_ldap_user{ .Form-title--is_superuser,
.Form-title--is_system_auditor,
.Form-title--is_ldap_user,
.Form-title--is_external_account{
height:15px; height:15px;
color: @default-interface-txt; color: @default-interface-txt;
background-color: @default-list-header-bg; background-color: @default-list-header-bg;

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

@@ -334,6 +334,7 @@ export function UsersEdit($scope, $rootScope, $location,
$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; $scope.socialAuthUser = (data.auth.length > 0) ? true : false;
$scope.external_account = data.external_account;
$scope.user_type = $scope.user_type_options[0]; $scope.user_type = $scope.user_type_options[0];
$scope.is_system_auditor = false; $scope.is_system_auditor = false;

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

@@ -46,7 +46,7 @@ export default
label: 'Username', label: 'Username',
type: 'text', type: 'text',
awRequiredWhen: { awRequiredWhen: {
reqExpression: "not_ldap_user", reqExpression: "not_ldap_user && !external_account",
init: true init: true
}, },
autocomplete: false autocomplete: false
@@ -69,7 +69,7 @@ export default
label: 'Password', label: 'Password',
type: 'sensitive', type: 'sensitive',
hasShowInputButton: true, hasShowInputButton: true,
ngShow: 'ldap_user == false && socialAuthUser === false', ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
addRequired: true, addRequired: true,
editRequired: false, editRequired: false,
ngChange: "clearPWConfirm('password_confirm')", ngChange: "clearPWConfirm('password_confirm')",
@@ -80,7 +80,7 @@ export default
label: 'Confirm Password', label: 'Confirm Password',
type: 'sensitive', type: 'sensitive',
hasShowInputButton: true, hasShowInputButton: true,
ngShow: 'ldap_user == false && socialAuthUser === false', ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
addRequired: true, addRequired: true,
editRequired: false, editRequired: false,
awPassMatch: true, awPassMatch: true,

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -1487,6 +1487,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
"ng-show='is_system_auditor'>Auditor</span>"; "ng-show='is_system_auditor'>Auditor</span>";
html+= "<span class=\"Form-title--is_ldap_user\" "+ html+= "<span class=\"Form-title--is_ldap_user\" "+
"ng-show='ldap_user'>LDAP</span>"; "ng-show='ldap_user'>LDAP</span>";
html+= "<span class=\"Form-title--is_external_account\" "+
"ng-show='external_account'>{{external_account}}</span>";
} }
html += "</div>\n"; html += "</div>\n";
html += "<div class=\"Form-header--fields\">"; html += "<div class=\"Form-header--fields\">";