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

Replace filter_by_access with restrict_queryset

Browse Source 
With the interface finalized, replace .filter_by_access() in
the generic view mixins with restrict_queryset().

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-01-22 22:16:56 -04:00
parent 108c54630f
commit 205ca594f5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/common/mixins.py
View File

@@ -117,7 +117,7 @@ class ExternalObjectMixin(object):
permission = self.get_external_object_permission() permission = self.get_external_object_permission()
if permission: if permission:
queryset = AccessControlList.objects.filter_by_access( queryset = AccessControlList.objects.restrict_queryset(
permission=permission, queryset=queryset, permission=permission, queryset=queryset,
user=self.request.user user=self.request.user
) )
@@ -260,7 +260,7 @@ class MultipleObjectMixin(object):
) )
if self.object_permission: if self.object_permission:
return AccessControlList.objects.filter_by_access( return AccessControlList.objects.restrict_queryset(
permission=self.object_permission, queryset=queryset, permission=self.object_permission, queryset=queryset,
user=self.request.user user=self.request.user
) )
@@ -333,7 +333,7 @@ class ObjectListPermissionFilterMixin(object):
queryset = super(ObjectListPermissionFilterMixin, self).get_queryset() queryset = super(ObjectListPermissionFilterMixin, self).get_queryset()
if not self.access_object_retrieve_method and self.object_permission: if not self.access_object_retrieve_method and self.object_permission:
return AccessControlList.objects.filter_by_access( return AccessControlList.objects.restrict_queryset(
permission=self.object_permission, queryset=queryset, permission=self.object_permission, queryset=queryset,
user=self.request.user user=self.request.user
) )