External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2387 from wwitzel3/issue-2316

Browse Source 
remove User.object_roles endpoint and discovery
This commit is contained in:
Wayne Witzel III
2016-06-14 13:43:58 -04:00
committed by GitHub
parent a592cb53f2 203ebd20e8
commit 6013a853f5
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/serializers.py
View File

@@ -768,7 +768,6 @@ class UserSerializer(BaseSerializer):
projects = reverse('api:user_projects_list', args=(obj.pk,)), projects = reverse('api:user_projects_list', args=(obj.pk,)),
credentials = reverse('api:user_credentials_list', args=(obj.pk,)), credentials = reverse('api:user_credentials_list', args=(obj.pk,)),
roles = reverse('api:user_roles_list', args=(obj.pk,)), roles = reverse('api:user_roles_list', args=(obj.pk,)),
object_roles = reverse('api:user_object_roles_list', args=(obj.pk,)),
activity_stream = reverse('api:user_activity_stream_list', args=(obj.pk,)), activity_stream = reverse('api:user_activity_stream_list', args=(obj.pk,)),
access_list = reverse('api:user_access_list', args=(obj.pk,)), access_list = reverse('api:user_access_list', args=(obj.pk,)),
)) ))

1
awx/api/urls.py
View File

@@ -38,7 +38,6 @@ user_urls = patterns('awx.api.views',
url(r'^(?P<pk>[0-9]+)/projects/$', 'user_projects_list'), url(r'^(?P<pk>[0-9]+)/projects/$', 'user_projects_list'),
url(r'^(?P<pk>[0-9]+)/credentials/$', 'user_credentials_list'), url(r'^(?P<pk>[0-9]+)/credentials/$', 'user_credentials_list'),
url(r'^(?P<pk>[0-9]+)/roles/$', 'user_roles_list'), url(r'^(?P<pk>[0-9]+)/roles/$', 'user_roles_list'),
url(r'^(?P<pk>[0-9]+)/object_roles/$', 'user_object_roles_list'),
url(r'^(?P<pk>[0-9]+)/activity_stream/$', 'user_activity_stream_list'), url(r'^(?P<pk>[0-9]+)/activity_stream/$', 'user_activity_stream_list'),
url(r'^(?P<pk>[0-9]+)/access_list/$', 'user_access_list'), url(r'^(?P<pk>[0-9]+)/access_list/$', 'user_access_list'),

13
awx/api/views.py
View File

@@ -1201,19 +1201,6 @@ class UserRolesList(SubListCreateAttachDetachAPIView):
# We hide roles that shouldn't be seen in our queryset # We hide roles that shouldn't be seen in our queryset
return True return True
class UserObjectRolesList(SubListAPIView):
model = Role
serializer_class = RoleSerializer
parent_model = User
new_in_300 = True
def get_queryset(self):
po = self.get_parent_object()
content_type = ContentType.objects.get_for_model(self.parent_model)
return Role.objects.filter(content_type=content_type, object_id=po.pk)
class UserProjectsList(SubListAPIView): class UserProjectsList(SubListAPIView):
model = Project model = Project