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

Merge branch 'master' into expunge-zeromq-unstable

Browse Source 
Conflicts:
	awx/main/management/commands/run_callback_receiver.py
	awx/main/management/commands/run_task_system.py
This commit is contained in:
Luke Sneeringer
2014-11-11 12:00:25 -06:00
parent 122bf9fcd3 29eaa495bc
commit 3a8c32444b
4 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/views.py
View File

@@ -775,6 +775,7 @@ class UserList(ListCreateAPIView):
model = User
serializer_class = UserSerializer
@disallow_superuser_escalation
class UserMeList(ListAPIView):
model = User
@@ -849,7 +850,7 @@ class UserActivityStreamList(SubListAPIView):
return qs.filter(Q(actor=parent) | Q(user__in=[parent]))
@disallow_superuser_escalation
class UserDetail(RetrieveUpdateDestroyAPIView):
model = User