Skip to content
Snippets Groups Projects
Commit e6206af4 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Rename is_person predicate to is_current_person

parent 7f3a445d
No related branches found
No related tags found
1 merge request!207Resolve "Roles and permissions"
Pipeline #1587 failed
...@@ -5,7 +5,7 @@ from aleksis.core.util.predicates import ( ...@@ -5,7 +5,7 @@ from aleksis.core.util.predicates import (
has_person_predicate, has_person_predicate,
has_global_perm, has_global_perm,
has_any_object, has_any_object,
is_person, is_current_person,
has_object_perm, has_object_perm,
) )
...@@ -27,31 +27,31 @@ add_perm("core.view_persons", view_persons_predicate) ...@@ -27,31 +27,31 @@ add_perm("core.view_persons", view_persons_predicate)
# View person # View person
view_person_predicate = has_person_predicate & ( 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) add_perm("core.view_person", view_person_predicate)
# View person address # View person address
view_address_predicate = has_person_predicate & ( 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) add_perm("core.view_address", view_address_predicate)
# View person contact details # View person contact details
view_contact_details_predicate = has_person_predicate & ( 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) add_perm("core.view_contact_details", view_contact_details_predicate)
# View person photo # View person photo
view_photo_predicate = has_person_predicate & ( 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) add_perm("core.view_photo", view_photo_predicate)
# View persons groups # View persons groups
view_groups_predicate = has_person_predicate & ( 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) add_perm("core.view_person_groups", view_groups_predicate)
......
...@@ -80,7 +80,7 @@ def has_person_predicate(user: User) -> bool: ...@@ -80,7 +80,7 @@ def has_person_predicate(user: User) -> bool:
@predicate @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 """ """ Predicate which checks if the provided object is the person linked to the user object """
return user.person == obj return user.person == obj
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment