Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Paweljong
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
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
Teckids
Projekt Hack-n-Fun
AlekSIS-App-Paweljong
Commits
f7677563
Commit
f7677563
authored
3 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Remove useless predicates
parent
de4b86c7
No related branches found
No related tags found
1 merge request
!15
Resolve "Permissions by group owners"
Pipeline
#59143
failed
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/paweljong/predicates.py
+3
-19
3 additions, 19 deletions
aleksis/apps/paweljong/predicates.py
aleksis/apps/paweljong/rules.py
+0
-13
0 additions, 13 deletions
aleksis/apps/paweljong/rules.py
with
3 additions
and
32 deletions
aleksis/apps/paweljong/predicates.py
+
3
−
19
View file @
f7677563
...
...
@@ -11,31 +11,15 @@ User = get_user_model()
@predicate
def
see_group_by_grouptype
(
user
:
User
,
group
:
Group
)
->
bool
:
"""
Predicate which checks if the user is allowed to see the groups GroupType.
"""
grouptype
=
group
.
group_type
return
check_object_permission
(
user
,
"
core.view_grouptype
"
,
grouptype
)
@predicate
def
see_owned_groups_members
(
user
:
User
,
person
:
Person
)
->
bool
:
"""
Owners of groups can see their members.
"""
groups_list
=
user
.
person
.
owner_of
.
all
().
values_list
(
"
id
"
,
flat
=
True
)
return
Person
.
member_of
.
filter
(
id__in
=
groups_list
).
exists
()
@predicate
def
is_own_voucher
(
user
:
User
,
voucher
:
Voucher
)
->
bool
:
def
is_own_voucher
(
user
:
User
,
obj
:
Voucher
)
->
bool
:
"""
Predicate which checks if the voucher belongs to the user.
"""
return
voucher
.
person
==
user
.
person
return
obj
.
person
==
user
.
person
@predicate
def
is_own_registration
(
user
:
User
,
registration
:
EventRegistration
)
->
bool
:
"""
Predicate which checks if the registration belongs to the user.
"""
return
registration
.
person
==
user
.
person
return
obj
.
person
==
user
.
person
@predicate
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/paweljong/rules.py
+
0
−
13
View file @
f7677563
...
...
@@ -14,8 +14,6 @@ from .predicates import (
is_own_registration
,
is_own_voucher
,
is_organiser
,
see_group_by_grouptype
,
see_owned_groups_members
,
)
# View vouchers
...
...
@@ -65,17 +63,6 @@ create_events_predicate = has_person & (
)
rules
.
add_perm
(
"
paweljong.create_events_rule
"
,
create_events_predicate
)
# Allowed to see group
may_see_group_predicate
=
has_person
&
(
is_group_member
|
has_any_object
(
"
core.view_group
"
,
Group
)
|
see_group_by_grouptype
)
rules
.
add_perm
(
"
paweljong.may_see_group_rule
"
,
may_see_group_predicate
)
may_see_person_predicate
=
has_person
&
(
see_owned_groups_members
|
has_object_perm
(
"
core.view_person
"
)
)
rules
.
add_perm
(
"
paweljong.see_person_rule
"
,
may_see_person_predicate
)
# Manage registrations
manage_registrations_predicate
=
has_person
&
(
has_global_perm
(
"
paweljong.manage_registration
"
)
...
...
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