Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
3511d63c
Commit
3511d63c
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Add missing has_person predicates in group roles rules
parent
e567ff54
No related branches found
No related tags found
1 merge request
!188
Resolve "Permission checking decorators raise internal server error if the user is anonymous"
Pipeline
#10808
passed
3 years ago
Stage: test
Stage: build
Stage: publish
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/rules.py
+9
-9
9 additions, 9 deletions
aleksis/apps/alsijil/rules.py
with
9 additions
and
9 deletions
aleksis/apps/alsijil/rules.py
+
9
−
9
View file @
3511d63c
...
@@ -241,7 +241,7 @@ delete_extramark_predicate = view_extramarks_predicate & has_global_perm("alsiji
...
@@ -241,7 +241,7 @@ delete_extramark_predicate = view_extramarks_predicate & has_global_perm("alsiji
add_perm
(
"
alsijil.delete_extramark
"
,
delete_extramark_predicate
)
add_perm
(
"
alsijil.delete_extramark
"
,
delete_extramark_predicate
)
# View group role list
# View group role list
view_group_roles_predicate
=
has_global_perm
(
"
alsijil.view_grouprole
"
)
view_group_roles_predicate
=
has_person
&
has_global_perm
(
"
alsijil.view_grouprole
"
)
add_perm
(
"
alsijil.view_grouproles
"
,
view_group_roles_predicate
)
add_perm
(
"
alsijil.view_grouproles
"
,
view_group_roles_predicate
)
# Add group role
# Add group role
...
@@ -258,14 +258,14 @@ delete_group_role_predicate = view_group_roles_predicate & has_global_perm(
...
@@ -258,14 +258,14 @@ delete_group_role_predicate = view_group_roles_predicate & has_global_perm(
)
)
add_perm
(
"
alsijil.delete_grouprole
"
,
delete_group_role_predicate
)
add_perm
(
"
alsijil.delete_grouprole
"
,
delete_group_role_predicate
)
view_assigned_group_roles_predicate
=
(
view_assigned_group_roles_predicate
=
has_person
&
(
is_group_owner
is_group_owner
|
has_global_perm
(
"
alsjil.assign_grouprole
"
)
|
has_global_perm
(
"
alsjil.assign_grouprole
"
)
|
has_object_perm
(
"
core.assign_grouprole
"
)
|
has_object_perm
(
"
core.assign_grouprole
"
)
)
)
add_perm
(
"
alsijil.view_assigned_grouproles
"
,
view_assigned_group_roles_predicate
)
add_perm
(
"
alsijil.view_assigned_grouproles
"
,
view_assigned_group_roles_predicate
)
view_assigned_group_roles_register_object_predicate
=
(
view_assigned_group_roles_register_object_predicate
=
has_person
&
(
is_lesson_teacher
is_lesson_teacher
|
is_lesson_original_teacher
|
is_lesson_original_teacher
|
is_lesson_parent_group_owner
|
is_lesson_parent_group_owner
...
@@ -276,20 +276,20 @@ add_perm(
...
@@ -276,20 +276,20 @@ add_perm(
view_assigned_group_roles_register_object_predicate
,
view_assigned_group_roles_register_object_predicate
,
)
)
assign_group_role_person_predicate
=
i
s_person
_group_owner
|
has_global_perm
(
assign_group_role_person_predicate
=
ha
s_person
&
(
"
alsjil.assign_grouprole
"
is_person_group_owner
|
has_global_perm
(
"
alsjil.assign_grouprole
"
)
)
)
add_perm
(
"
alsijil.assign_grouprole_to_person
"
,
assign_group_role_person_predicate
)
add_perm
(
"
alsijil.assign_grouprole_to_person
"
,
assign_group_role_person_predicate
)
assign_group_role_for_multiple_predicate
=
is_owner_of_any_group
|
has_global_perm
(
assign_group_role_for_multiple_predicate
=
has_person
&
(
"
alsjil.assign_grouprole
"
is_owner_of_any_group
|
has_global_perm
(
"
alsjil.assign_grouprole
"
)
)
)
add_perm
(
"
alsijil.assign_grouprole_for_multiple
"
,
assign_group_role_for_multiple_predicate
)
add_perm
(
"
alsijil.assign_grouprole_for_multiple
"
,
assign_group_role_for_multiple_predicate
)
assign_group_role_group_predicate
=
view_assigned_group_roles_predicate
assign_group_role_group_predicate
=
view_assigned_group_roles_predicate
add_perm
(
"
alsijil.assign_grouprole_for_group
"
,
assign_group_role_group_predicate
)
add_perm
(
"
alsijil.assign_grouprole_for_group
"
,
assign_group_role_group_predicate
)
edit_group_role_assignment_predicate
=
(
edit_group_role_assignment_predicate
=
has_person
&
(
has_global_perm
(
"
alsjil.assign_grouprole
"
)
|
is_group_role_assignment_group_owner
has_global_perm
(
"
alsjil.assign_grouprole
"
)
|
is_group_role_assignment_group_owner
)
)
add_perm
(
"
alsijil.edit_grouproleassignment
"
,
edit_group_role_assignment_predicate
)
add_perm
(
"
alsijil.edit_grouproleassignment
"
,
edit_group_role_assignment_predicate
)
...
@@ -297,7 +297,7 @@ add_perm("alsijil.edit_grouproleassignment", edit_group_role_assignment_predicat
...
@@ -297,7 +297,7 @@ add_perm("alsijil.edit_grouproleassignment", edit_group_role_assignment_predicat
stop_group_role_assignment_predicate
=
edit_group_role_assignment_predicate
stop_group_role_assignment_predicate
=
edit_group_role_assignment_predicate
add_perm
(
"
alsijil.stop_grouproleassignment
"
,
stop_group_role_assignment_predicate
)
add_perm
(
"
alsijil.stop_grouproleassignment
"
,
stop_group_role_assignment_predicate
)
delete_group_role_assignment_predicate
=
(
delete_group_role_assignment_predicate
=
has_person
&
(
has_global_perm
(
"
alsjil.assign_grouprole
"
)
|
is_group_role_assignment_group_owner
has_global_perm
(
"
alsjil.assign_grouprole
"
)
|
is_group_role_assignment_group_owner
)
)
add_perm
(
"
alsijil.delete_grouproleassignment
"
,
delete_group_role_assignment_predicate
)
add_perm
(
"
alsijil.delete_grouproleassignment
"
,
delete_group_role_assignment_predicate
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment