1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00

Merge pull request #2594 from wenottingham/cherry-pickin

cherry pick some more AWX things
This commit is contained in:
Bill Nottingham 2018-07-19 10:03:48 -04:00 committed by GitHub
commit d66b61b854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -42,6 +42,7 @@ class PosixUIDGroupType(LDAPGroupType):
)
search = group_search.search_with_additional_term_string(filterstr)
search.attrlist = [self.name_attr]
groups = search.execute(ldap_user.connection)
except (KeyError, IndexError):
pass
@ -72,4 +73,3 @@ class PosixUIDGroupType(LDAPGroupType):
is_member = False
return is_member

View File

@ -36,8 +36,7 @@ export default ['i18n', function(i18n) {
label: i18n._('Last Name'),
type: 'text',
ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)',
required: true,
capitalize: true
required: true
},
organization: {
label: i18n._('Organization'),