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
f2151ca2
Commit
f2151ca2
authored
4 years ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Remove usage of has_any_object and change to custom queries
parent
bd4c962a
No related branches found
No related tags found
1 merge request
!49
Resolve "Add rules and permissions"
Pipeline
#3439
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/rules.py
+3
-3
3 additions, 3 deletions
aleksis/apps/alsijil/rules.py
aleksis/apps/alsijil/util/predicates.py
+17
-4
17 additions, 4 deletions
aleksis/apps/alsijil/util/predicates.py
with
20 additions
and
7 deletions
aleksis/apps/alsijil/rules.py
+
3
−
3
View file @
f2151ca2
from
rules
import
add_perm
from
aleksis.core.models
import
Person
from
aleksis.core.util.predicates
import
(
has_any_object
,
has_global_perm
,
has_object_perm
,
has_person
,
...
...
@@ -10,6 +8,7 @@ from aleksis.core.util.predicates import (
)
from
.util.predicates
import
(
has_any_object_absence
,
has_lesson_group_object_perm
,
has_personal_note_group_perm
,
has_person_group_object_perm
,
...
...
@@ -96,7 +95,8 @@ add_perm("alsijil.view_week_personalnote", view_week_personal_notes_predicate)
# View register absence page
view_register_absence_predicate
=
has_person
&
(
has_any_object
(
"
alsijil.register_absence
"
,
Person
)
has_global_perm
(
"
alsijil.register_absence
"
)
|
has_any_object_absence
)
add_perm
(
"
alsijil.view_register_absence
"
,
view_register_absence_predicate
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/util/predicates.py
+
17
−
4
View file @
f2151ca2
...
...
@@ -2,11 +2,13 @@ from typing import Union
from
django.contrib.auth.models
import
User
from
guardian.shortcuts
import
get_objects_for_user
from
rules
import
predicate
from
aleksis.apps.chronos.models
import
LessonPeriod
from
aleksis.core.models
import
Group
,
Person
from
aleksis.core.util.predicates
import
check_object_permission
,
get_site_preferences
from
aleksis.core.util.predicates
import
check_object_permission
from
aleksis.core.util.core_helpers
import
get_site_preferences
from
..models
import
PersonalNote
...
...
@@ -140,7 +142,7 @@ def has_personal_note_group_perm(perm: str):
@predicate
def
is_own_personal_note
(
user
:
User
,
obj
:
PersonalNote
):
def
is_own_personal_note
(
user
:
User
,
obj
:
PersonalNote
)
->
bool
:
"""
Predicate for users referred to in a personal note
Checks whether the user referred to in a PersonalNote is the active user.
...
...
@@ -153,7 +155,7 @@ def is_own_personal_note(user: User, obj: PersonalNote):
@predicate
def
is_personal_note_lesson_teacher
(
user
:
User
,
obj
:
PersonalNote
):
def
is_personal_note_lesson_teacher
(
user
:
User
,
obj
:
PersonalNote
)
->
bool
:
"""
Predicate for teachers of a lesson referred to in the lesson period of a personal note.
Checks whether the person linked to the user is a teacher
...
...
@@ -170,7 +172,7 @@ def is_personal_note_lesson_teacher(user: User, obj: PersonalNote):
@predicate
def
is_personal_note_lesson_parent_group_owner
(
user
:
User
,
obj
:
PersonalNote
):
def
is_personal_note_lesson_parent_group_owner
(
user
:
User
,
obj
:
PersonalNote
)
->
bool
:
"""
Predicate for parent group owners of a lesson referred to in the lesson period of a personal note.
...
...
@@ -182,3 +184,14 @@ def is_personal_note_lesson_parent_group_owner(user: User, obj: PersonalNote):
return
obj
.
lesson_period
.
lesson
.
groups
.
filter
(
parent_groups__owners
=
user
.
person
).
exists
()
return
False
return
False
@predicate
def
has_any_object_absence
(
user
:
User
)
->
bool
:
"""
Predicate which builds a query with all the persons the given users is allowed to register an absence for.
"""
return
get_objects_for_user
(
user
,
"
core.register_absence_person
"
,
Person
)
\
.
union
(
Person
.
objects
.
filter
(
member_of__owners
=
user
))
\
.
union
(
Person
.
objects
.
filter
(
member_of__in
=
get_objects_for_user
(
user
,
"
core.register_absence_group
"
,
Group
)))
\
.
exists
()
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