diff --git a/aleksis/core/rules.py b/aleksis/core/rules.py index 371949baa67aca1463c1c286795a31c9189bc54d..44ba9198c4a6d44f326766452a302b583fde931f 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 7a209b048f43f663b41aec4420865648e6cea7cb..f1d06327e57a8d63031dd1aa72ce162ac77151ac 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