From abee08ee1dde39c60d9418381b27ee233f0685d1 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sun, 28 Jun 2020 12:09:22 +0200
Subject: [PATCH] Use new helper function in has_any_object predicate
---
aleksis/core/util/predicates.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/aleksis/core/util/predicates.py b/aleksis/core/util/predicates.py
index 975273d7d..b43f54468 100644
--- a/aleksis/core/util/predicates.py
+++ b/aleksis/core/util/predicates.py
@@ -4,11 +4,10 @@ from django.db.models import Model
from django.http import HttpRequest
from guardian.backends import ObjectPermissionBackend
-from guardian.shortcuts import get_objects_for_user
from rules import predicate
from ..models import Group
-from .core_helpers import get_site_preferences
+from .core_helpers import get_site_preferences, queryset_rules_filter
from .core_helpers import has_person as has_person_helper
@@ -63,7 +62,7 @@ def has_any_object(perm: str, klass):
@predicate(name)
def fn(user: User) -> bool:
- objs = get_objects_for_user(user, perm, klass)
+ objs = queryset_rules_filter(user, klass.objects.all(), perm)
return len(objs) > 0
return fn
--
GitLab