From e6206af4011ddf45960bd97f116123d157a3a150 Mon Sep 17 00:00:00 2001
From: Hangzhi <hangzhi@protonmail.com>
Date: Mon, 20 Apr 2020 21:30:36 +0200
Subject: [PATCH] Rename is_person predicate to is_current_person
---
aleksis/core/rules.py | 12 ++++++------
aleksis/core/util/predicates.py | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/aleksis/core/rules.py b/aleksis/core/rules.py
index 371949baa..44ba9198c 100644
--- a/aleksis/core/rules.py
+++ b/aleksis/core/rules.py
@@ -5,7 +5,7 @@ from aleksis.core.util.predicates import (
has_person_predicate,
has_global_perm,
has_any_object,
- is_person,
+ is_current_person,
has_object_perm,
)
@@ -27,31 +27,31 @@ add_perm("core.view_persons", view_persons_predicate)
# View person
view_person_predicate = has_person_predicate & (
- has_global_perm("core.view_person") | has_object_perm("core.view_person") | is_person
+ has_global_perm("core.view_person") | has_object_perm("core.view_person") | is_current_person
)
add_perm("core.view_person", view_person_predicate)
# View person address
view_address_predicate = has_person_predicate & (
- has_global_perm("core.view_address") | has_object_perm("core.view_address") | is_person
+ has_global_perm("core.view_address") | has_object_perm("core.view_address") | is_current_person
)
add_perm("core.view_address", view_address_predicate)
# View person contact details
view_contact_details_predicate = has_person_predicate & (
- has_global_perm("core.view_contact_details") | has_object_perm("core.view_contact_details") | is_person
+ has_global_perm("core.view_contact_details") | has_object_perm("core.view_contact_details") | is_current_person
)
add_perm("core.view_contact_details", view_contact_details_predicate)
# View person photo
view_photo_predicate = has_person_predicate & (
- has_global_perm("core.view_photo") | has_object_perm("core.view_photo") | is_person
+ has_global_perm("core.view_photo") | has_object_perm("core.view_photo") | is_current_person
)
add_perm("core.view_photo", view_photo_predicate)
# View persons groups
view_groups_predicate = has_person_predicate & (
- has_global_perm("core.view_person_groups") | has_object_perm("core.view_person_groups") | is_person
+ has_global_perm("core.view_person_groups") | has_object_perm("core.view_person_groups") | is_current_person
)
add_perm("core.view_person_groups", view_groups_predicate)
diff --git a/aleksis/core/util/predicates.py b/aleksis/core/util/predicates.py
index 7a209b048..f1d06327e 100644
--- a/aleksis/core/util/predicates.py
+++ b/aleksis/core/util/predicates.py
@@ -80,7 +80,7 @@ def has_person_predicate(user: User) -> bool:
@predicate
-def is_person(user: User, obj: Model) -> bool:
+def is_current_person(user: User, obj: Model) -> bool:
""" Predicate which checks if the provided object is the person linked to the user object """
return user.person == obj
--
GitLab