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
8913e041
Verified
Commit
8913e041
authored
4 months ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Optimize query
parent
40b86d09
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!427
Optimize query
Pipeline
#193529
failed
4 months ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/models.py
+11
-11
11 additions, 11 deletions
aleksis/apps/alsijil/models.py
with
11 additions
and
11 deletions
aleksis/apps/alsijil/models.py
+
11
−
11
View file @
8913e041
...
...
@@ -4,8 +4,7 @@ from typing import Optional
from
django.contrib.auth.models
import
User
from
django.core.exceptions
import
PermissionDenied
from
django.db
import
models
from
django.db.models
import
QuerySet
from
django.db.models.query_utils
import
Q
from
django.db.models
import
QuerySet
,
Q
from
django.http
import
HttpRequest
from
django.urls
import
reverse
from
django.utils
import
timezone
...
...
@@ -438,20 +437,21 @@ class ParticipationStatus(CalendarEvent):
@classmethod
def
get_objects
(
cls
,
request
:
HttpRequest
|
None
=
None
,
params
:
dict
[
str
,
any
]
|
None
=
None
,
**
kwargs
cls
,
request
:
HttpRequest
|
None
=
None
,
params
:
dict
[
str
,
any
]
|
None
=
None
,
additional_filter
:
Q
|
None
=
None
,
**
kwargs
)
->
QuerySet
:
qs
=
(
super
()
.
get_objects
(
request
,
params
,
**
kwargs
)
.
select_related
(
"
person
"
,
"
absence_reason
"
)
)
q
=
additional_filter
or
Q
()
if
params
:
if
params
.
get
(
"
person
"
):
q
s
=
q
s
.
filter
(
person
=
params
[
"
person
"
])
q
=
q
&
Q
(
person
=
params
[
"
person
"
])
elif
params
.
get
(
"
persons
"
):
q
s
=
q
s
.
filter
(
person__in
=
params
[
"
persons
"
])
q
=
q
&
Q
(
person__in
=
params
[
"
persons
"
])
elif
params
.
get
(
"
group
"
):
qs
=
qs
.
filter
(
groups_of_person__in
=
params
.
get
(
"
group
"
))
q
=
q
&
Q
(
groups_of_person__in
=
params
.
get
(
"
group
"
))
qs
=
(
super
()
.
get_objects
(
request
,
params
,
additional_filter
=
q
,
select_related
=
[
"
person
"
,
"
absence_reason
"
],
**
kwargs
)
)
return
qs
@classmethod
...
...
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