diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 0825b08c4c..2e3b2d41f0 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1186,8 +1186,6 @@ class GroupSerializer(BaseSerializerWithVariables): activity_stream = reverse('api:group_activity_stream_list', args=(obj.pk,)), inventory_sources = reverse('api:group_inventory_sources_list', args=(obj.pk,)), ad_hoc_commands = reverse('api:group_ad_hoc_commands_list', args=(obj.pk,)), - access_list = reverse('api:group_access_list', args=(obj.pk,)), - object_roles = reverse('api:group_object_roles_list', args=(obj.pk,)), #single_fact = reverse('api:group_single_fact_view', args=(obj.pk,)), )) if obj.inventory: diff --git a/awx/api/urls.py b/awx/api/urls.py index d5fe2eb40f..19ecdd3e1b 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -127,8 +127,6 @@ group_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/activity_stream/$', 'group_activity_stream_list'), url(r'^(?P[0-9]+)/inventory_sources/$', 'group_inventory_sources_list'), url(r'^(?P[0-9]+)/ad_hoc_commands/$', 'group_ad_hoc_commands_list'), - url(r'^(?P[0-9]+)/access_list/$', 'group_access_list'), - url(r'^(?P[0-9]+)/object_roles/$', 'group_object_roles_list'), #url(r'^(?P[0-9]+)/single_fact/$', 'group_single_fact_view'), ) diff --git a/awx/api/views.py b/awx/api/views.py index 25c75ae2a2..8d1ffda5f6 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1870,25 +1870,6 @@ class GroupDetail(RetrieveUpdateDestroyAPIView): obj.delete_recursive() return Response(status=status.HTTP_204_NO_CONTENT) -class GroupAccessList(ResourceAccessList): - - model = User # needs to be User for AccessLists's - resource_model = Group - new_in_300 = True - -class GroupObjectRolesList(SubListAPIView): - - model = Role - serializer_class = RoleSerializer - parent_model = Group - 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 InventoryGroupsList(SubListCreateAttachDetachAPIView): model = Group diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index af67727583..0cb302f907 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -443,7 +443,7 @@ class Host(CommonModelNameNotUnique): # Use .job_events.all() to get events affecting this host. -class Group(CommonModelNameNotUnique, ResourceMixin): +class Group(CommonModelNameNotUnique): ''' A group containing managed hosts. A group or host may belong to multiple groups.