From a47f47b7909144371ac0544952a3b5add63893a3 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 14 Jun 2016 11:42:08 -0400 Subject: [PATCH 1/2] remove URL and related mapping for User.object_roles --- awx/api/serializers.py | 1 - awx/api/urls.py | 1 - 2 files changed, 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 3d7508a1fa..dff4648ff7 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -768,7 +768,6 @@ class UserSerializer(BaseSerializer): projects = reverse('api:user_projects_list', args=(obj.pk,)), credentials = reverse('api:user_credentials_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,)), access_list = reverse('api:user_access_list', args=(obj.pk,)), )) diff --git a/awx/api/urls.py b/awx/api/urls.py index e22bc61e63..3670a22d02 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -38,7 +38,6 @@ user_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/projects/$', 'user_projects_list'), url(r'^(?P[0-9]+)/credentials/$', 'user_credentials_list'), url(r'^(?P[0-9]+)/roles/$', 'user_roles_list'), - url(r'^(?P[0-9]+)/object_roles/$', 'user_object_roles_list'), url(r'^(?P[0-9]+)/activity_stream/$', 'user_activity_stream_list'), url(r'^(?P[0-9]+)/access_list/$', 'user_access_list'), From 203ebd20e880a87fb894aa2b03ffe2278489a5aa Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 14 Jun 2016 11:42:23 -0400 Subject: [PATCH 2/2] remove the User.object_roles view --- awx/api/views.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 4cdf4363f3..07f851d342 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1201,19 +1201,6 @@ class UserRolesList(SubListCreateAttachDetachAPIView): # We hide roles that shouldn't be seen in our queryset 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): model = Project