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

Merge pull request #3301 from wwitzel3/release_3.0.2

Browse Source 
remove last_name and first_name from admin_only fields
This commit is contained in:
Wayne Witzel III
2016-08-23 15:17:35 -04:00
committed by GitHub
parent c963035178 2fb386b23c
commit efa8496407
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/views.py
View File

@@ -1319,7 +1319,7 @@ class UserDetail(RetrieveUpdateDestroyAPIView):
can_admin = request.user.can_access(User, 'admin', obj, request.data) can_admin = request.user.can_access(User, 'admin', obj, request.data)
su_only_edit_fields = ('is_superuser', 'is_system_auditor') su_only_edit_fields = ('is_superuser', 'is_system_auditor')
admin_only_edit_fields = ('last_name', 'first_name', 'username', 'is_active') admin_only_edit_fields = ('username', 'is_active')
fields_to_check = () fields_to_check = ()
if not request.user.is_superuser: if not request.user.is_superuser:

4
awx/main/tests/old/users.py
View File

@@ -329,9 +329,9 @@ class UsersTest(BaseTest):
detail_url = reverse('api:user_detail', args=(self.other_django_user.pk,)) detail_url = reverse('api:user_detail', args=(self.other_django_user.pk,))
data = self.get(detail_url, expect=200, auth=self.get_other_credentials()) data = self.get(detail_url, expect=200, auth=self.get_other_credentials())
# can't change first_name, last_name, etc # can change first_name, last_name, etc
data['last_name'] = "NewLastName" data['last_name'] = "NewLastName"
self.put(detail_url, data, expect=403, auth=self.get_other_credentials()) self.put(detail_url, data, expect=200, auth=self.get_other_credentials())
# can't change username # can't change username
data['username'] = 'newUsername' data['username'] = 'newUsername'