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
f7d5eb63
Commit
f7d5eb63
authored
3 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Fix use of predicate
parent
d9ffc22a
No related branches found
No related tags found
1 merge request
!14
Payments
Pipeline
#59290
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
+13
-4
13 additions, 4 deletions
aleksis/apps/paweljong/predicates.py
aleksis/apps/paweljong/rules.py
+1
-1
1 addition, 1 deletion
aleksis/apps/paweljong/rules.py
with
14 additions
and
5 deletions
aleksis/apps/paweljong/predicates.py
+
13
−
4
View file @
f7d5eb63
from
typing
import
Union
from
django.contrib.auth
import
get_user_model
from
rules
import
predicate
...
...
@@ -5,7 +7,7 @@ from rules import predicate
from
aleksis.core.models
import
Group
,
Person
from
aleksis.core.util.predicates
import
check_object_permission
from
.models
import
EventRegistration
,
Voucher
from
.models
import
Event
,
EventRegistration
,
Voucher
User
=
get_user_model
()
...
...
@@ -23,11 +25,18 @@ def is_own_registration(user: User, registration: EventRegistration) -> bool:
@predicate
def
is_organiser
(
user
:
User
,
obj
:
EventRegistration
)
->
bool
:
def
is_organiser
(
user
:
User
,
obj
:
Union
[
Event
,
EventRegistration
]
)
->
bool
:
"""
Predicate which checks if the user is an organiser.
"""
return
user
.
person
in
obj
.
event
.
linked_group
.
owners
.
all
()
if
isinstance
(
obj
,
EventRegistration
):
event
=
obj
.
event
elif
isinstance
(
obj
,
Event
):
event
=
obj
else
:
raise
TypeError
(
"
This predicate can only check Event and EventRegistration.
"
)
return
user
.
person
in
event
.
linked_group
.
owners
.
all
()
@predicate
def
is_event_published
(
obj
:
EventRegistration
)
->
bool
:
def
is_event_published
(
user
:
User
,
obj
:
EventRegistration
)
->
bool
:
"""
Predicate which checks if the event is published.
"""
return
obj
.
published
This diff is collapsed.
Click to expand it.
aleksis/apps/paweljong/rules.py
+
1
−
1
View file @
f7d5eb63
...
...
@@ -225,6 +225,6 @@ can_view_menu_predicate = has_person & (
|
view_terms_predicate
|
view_vouchers_predicate
|
view_events_predicate
|
view_
events_
registration_states_predicate
|
view_registration_states_predicate
)
rules
.
add_perm
(
"
paweljong.view_menu
"
,
can_view_menu_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