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

Merge pull request #2594 from wenottingham/cherry-pickin

Browse Source 
cherry pick some more AWX things
This commit is contained in:
Bill Nottingham
2018-07-19 10:03:48 -04:00
committed by GitHub
parent 77dd2c86dc 8754ab80c7
commit d66b61b854
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/sso/ldap_group_types.py
View File

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

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

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