use ParentMixin machinery to check access_list parent obj permissions

This commit is contained in:
AlanCoding 2017-01-04 13:39:14 -05:00
parent 448b066cfc
commit bd82ab9fb0
3 changed files with 11 additions and 14 deletions

View File

@ -558,14 +558,12 @@ class DestroyAPIView(GenericAPIView, generics.DestroyAPIView):
pass
class ResourceAccessList(ListAPIView):
class ResourceAccessList(ParentMixin, ListAPIView):
serializer_class = ResourceAccessListElementSerializer
def get_queryset(self):
self.object_id = self.kwargs['pk']
resource_model = getattr(self, 'resource_model')
obj = get_object_or_404(resource_model, pk=self.object_id)
obj = self.get_parent_object()
content_type = ContentType.objects.get_for_model(obj)
roles = set(Role.objects.filter(content_type=content_type, object_id=obj.id))

View File

@ -1586,8 +1586,7 @@ class ResourceAccessListElementSerializer(UserSerializer):
the resource.
'''
ret = super(ResourceAccessListElementSerializer, self).to_representation(user)
object_id = self.context['view'].object_id
obj = self.context['view'].resource_model.objects.get(pk=object_id)
obj = self.context['view'].get_parent_object()
if self.context['view'].request is not None:
requesting_user = self.context['view'].request.user
else:

View File

@ -872,7 +872,7 @@ class OrganizationNotificationTemplatesSuccessList(SubListCreateAttachDetachAPIV
class OrganizationAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = Organization
parent_model = Organization
new_in_300 = True
@ -1007,7 +1007,7 @@ class TeamActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
class TeamAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = Team
parent_model = Team
new_in_300 = True
@ -1201,7 +1201,7 @@ class ProjectUpdateNotificationsList(SubListAPIView):
class ProjectAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = Project
parent_model = Project
new_in_300 = True
@ -1414,7 +1414,7 @@ class UserDetail(RetrieveUpdateDestroyAPIView):
class UserAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = User
parent_model = User
new_in_300 = True
@ -1521,7 +1521,7 @@ class CredentialActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIVie
class CredentialAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = Credential
parent_model = Credential
new_in_300 = True
@ -1615,7 +1615,7 @@ class InventoryActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView
class InventoryAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = Inventory
parent_model = Inventory
new_in_300 = True
@ -2689,7 +2689,7 @@ class JobTemplateJobsList(SubListCreateAPIView):
class JobTemplateAccessList(ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = JobTemplate
parent_model = JobTemplate
new_in_300 = True
@ -3035,7 +3035,7 @@ class WorkflowJobTemplateNotificationTemplatesSuccessList(WorkflowsEnforcementMi
class WorkflowJobTemplateAccessList(WorkflowsEnforcementMixin, ResourceAccessList):
model = User # needs to be User for AccessLists's
resource_model = WorkflowJobTemplate
parent_model = WorkflowJobTemplate
new_in_310 = True