From 9fb1c20d06c724d7718c5dfb8b2096a0e31f560b Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sun, 28 Jun 2020 12:27:39 +0200
Subject: [PATCH] Remove duplicated code
---
aleksis/core/util/core_helpers.py | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py
index d35b194f2..e7f720574 100644
--- a/aleksis/core/util/core_helpers.py
+++ b/aleksis/core/util/core_helpers.py
@@ -358,14 +358,11 @@ def queryset_rules_filter(obj: Union[HttpRequest, Model], queryset: QuerySet, pe
"""Filter queryset by user and permission."""
wanted_objects = set()
- if isinstance(obj, HttpRequest):
- if hasattr(obj, "user"):
- for item in queryset:
- if obj.user.has_perm(perm, item):
- wanted_objects.add(item.pk)
- else:
- for item in queryset:
- if obj.has_perm(perm, item):
- wanted_objects.add(item.pk)
+ if isinstance(obj, HttpRequest) and hasattr(obj, "user"):
+ obj = obj.user
+
+ for item in queryset:
+ if obj.has_perm(perm, item):
+ wanted_objects.add(item.pk)
return queryset.filter(pk__in = wanted_objects)
--
GitLab