From 3428c6aa20df416f016ff9ac6c57075f05f281d2 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 5 Aug 2019 00:23:45 -0400 Subject: [PATCH] Update ExternalObjectMixin Call ModelPermission to select the proper manager for the queryset when specifying just the model. Signed-off-by: Roberto Rosario --- mayan/apps/common/mixins.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mayan/apps/common/mixins.py b/mayan/apps/common/mixins.py index 32a6ec2d4b..5e928d301e 100644 --- a/mayan/apps/common/mixins.py +++ b/mayan/apps/common/mixins.py @@ -8,6 +8,7 @@ from django.urls import reverse from django.utils.translation import ungettext, ugettext_lazy as _ from django.views.generic.detail import SingleObjectMixin +from mayan.apps.acls.classes import ModelPermission from mayan.apps.acls.models import AccessControlList from mayan.apps.permissions import Permission @@ -103,7 +104,15 @@ class ExternalObjectMixin(object): 'get_external_object_queryset() method.' ) - return self.external_object_queryset or self.external_object_class.objects.all() + queryset = self.external_object_queryset + + if not queryset: + manager = ModelPermission.get_manager( + model=self.external_object_class + ) + queryset = manager.all() + + return queryset def get_external_object_queryset_filtered(self): queryset = self.get_external_object_queryset()