Skip to content
Snippets Groups Projects
Commit 5c8fe455 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '224-menu-validator-fails-on-register-absence-item' into 'master'

Resolve "Menu validator fails on register absence item"

Closes #224

See merge request !299
parents 7a76c1ae 9059a947
No related branches found
No related tags found
1 merge request!299Resolve "Menu validator fails on register absence item"
Pipeline #86284 canceled
...@@ -96,7 +96,7 @@ MENUS = { ...@@ -96,7 +96,7 @@ MENUS = {
"validators": [ "validators": [
( (
"aleksis.core.util.predicates.permission_validator", "aleksis.core.util.predicates.permission_validator",
"alsijil.register_absence_rule", "alsijil.view_register_absence_rule",
), ),
], ],
}, },
......
...@@ -156,15 +156,20 @@ view_week_personal_notes_predicate = has_person & ( ...@@ -156,15 +156,20 @@ view_week_personal_notes_predicate = has_person & (
add_perm("alsijil.view_week_personalnote_rule", view_week_personal_notes_predicate) add_perm("alsijil.view_week_personalnote_rule", view_week_personal_notes_predicate)
# Register absence # Register absence
register_absence_predicate = has_person & ( view_register_absence_predicate = has_person & (
( (
is_person_group_owner is_person_group_owner
& is_site_preference_set("alsijil", "register_absence_as_primary_group_owner") & is_site_preference_set("alsijil", "register_absence_as_primary_group_owner")
) )
| has_global_perm("alsijil.register_absence") | has_global_perm("alsijil.register_absence")
)
register_absence_predicate = has_person & (
view_register_absence_predicate
| has_object_perm("core.register_absence_person") | has_object_perm("core.register_absence_person")
| has_person_group_object_perm("core.register_absence_group") | has_person_group_object_perm("core.register_absence_group")
) )
add_perm("alsijil.view_register_absence_rule", view_register_absence_predicate)
add_perm("alsijil.register_absence_rule", register_absence_predicate) add_perm("alsijil.register_absence_rule", register_absence_predicate)
# View full register for group # View full register for group
......
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