matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't override the content_type CBV attribute.

Browse Source 
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
This commit is contained in:
Roberto Rosario
2016-10-21 03:46:18 -04:00
parent a44c76165b
commit c881641ae8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/acls/views.py
View File

@@ -121,13 +121,13 @@ class ACLDeleteView(SingleObjectDeleteView):
class ACLListView(SingleObjectListView): class ACLListView(SingleObjectListView):
def dispatch(self, request, *args, **kwargs): 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'], ContentType, app_label=self.kwargs['app_label'],
model=self.kwargs['model'] model=self.kwargs['model']
) )
try: 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'] pk=self.kwargs['object_id']
) )
except self.content_type.model_class().DoesNotExist: except self.content_type.model_class().DoesNotExist:
@@ -153,7 +153,7 @@ class ACLListView(SingleObjectListView):
def get_queryset(self): def get_queryset(self):
return AccessControlList.objects.filter( 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
) )