From c881641ae8b7182255557d71b42b42168d2449dc Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 21 Oct 2016 03:46:18 -0400 Subject: [PATCH] Don't override the content_type CBV attribute. These views (get method views) used it to set the content type of the response. Fixes GitLab issue #311 for the ACL list view. Note to Django developers: self.content_type should be a private attribute -> self._content_type --- mayan/apps/acls/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index 1d827fbd81..2ee1228f20 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -121,13 +121,13 @@ class ACLDeleteView(SingleObjectDeleteView): class ACLListView(SingleObjectListView): def dispatch(self, request, *args, **kwargs): - self.content_type = get_object_or_404( + self.object_content_type = get_object_or_404( ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) try: - self.content_object = self.content_type.get_object_for_this_type( + self.content_object = self.object_content_type.get_object_for_this_type( pk=self.kwargs['object_id'] ) except self.content_type.model_class().DoesNotExist: @@ -153,7 +153,7 @@ class ACLListView(SingleObjectListView): def get_queryset(self): return AccessControlList.objects.filter( - content_type=self.content_type, object_id=self.content_object.pk + content_type=self.object_content_type, object_id=self.content_object.pk )