From 46812ab3d38991d71c58d9e7d69f2bb60626ba16 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 30 Jan 2019 17:09:46 -0400 Subject: [PATCH] Fix ACL filtering case #3 Test case #3: Generic Foreign Key, multiple ContentTypes + object IDs. Signed-off-by: Roberto Rosario --- mayan/apps/acls/managers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mayan/apps/acls/managers.py b/mayan/apps/acls/managers.py index 9a3f378450..8b55a5af1c 100644 --- a/mayan/apps/acls/managers.py +++ b/mayan/apps/acls/managers.py @@ -61,8 +61,6 @@ class AccessControlListManager(models.Manager): ) ).values('ct_fk_combination') - field_lookup = 'pk__in' - acl_filter = self.annotate( ct_fk_combination=Concat( 'content_type', V('-'), 'object_id', output_field=CharField() @@ -72,6 +70,8 @@ class AccessControlListManager(models.Manager): ct_fk_combination__in=content_type_object_id_queryset ).values('object_id') + field_lookup = 'object_id__in' + result.append(Q(**{field_lookup: acl_filter})) else: # Case 2: Related field of a single type, single ContentType,