Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Kolego
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
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®
Onboarding
AlekSIS-App-Kolego
Commits
ed8b9e97
Verified
Commit
ed8b9e97
authored
8 months ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Fix queryset for absence calendar event
parent
08ad7e10
No related branches found
No related tags found
1 merge request
!35
Fix queryset for absence calendar event
Pipeline
#191864
failed
8 months ago
Stage: prepare
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/kolego/managers.py
+2
-4
2 additions, 4 deletions
aleksis/apps/kolego/managers.py
aleksis/apps/kolego/models/absence.py
+6
-4
6 additions, 4 deletions
aleksis/apps/kolego/models/absence.py
with
8 additions
and
8 deletions
aleksis/apps/kolego/managers.py
+
2
−
4
View file @
ed8b9e97
from
polymorphic.managers
import
PolymorphicQuerySet
from
aleksis.core.managers
import
DateRangeQuerySetMixin
from
aleksis.core.managers
import
DateRangeQuerySetMixin
,
RecurrencePolymorphicQuerySet
from
aleksis.core.models
import
Person
class
AbsenceQuerySet
(
DateRangeQuerySetMixin
,
PolymorphicQuerySet
):
class
AbsenceQuerySet
(
DateRangeQuerySetMixin
,
Recurrence
PolymorphicQuerySet
):
"""
QuerySet with custom query methods for absences.
"""
def
absent_persons
(
self
):
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/kolego/models/absence.py
+
6
−
4
View file @
ed8b9e97
...
...
@@ -5,7 +5,9 @@ from django.utils.translation import gettext_lazy as _
from
colorfield.fields
import
ColorField
from
aleksis.core.managers
import
PolymorphicBaseManager
from
aleksis.core.managers
import
(
RecurrencePolymorphicManager
,
)
from
aleksis.core.mixins
import
ExtensibleModel
from
aleksis.core.models
import
FreeBusy
...
...
@@ -69,7 +71,7 @@ class AbsenceReason(ExtensibleModel):
class
Absence
(
FreeBusy
):
objects
=
Polymorphic
Base
Manager
.
from_queryset
(
AbsenceQuerySet
)()
objects
=
Recurrence
PolymorphicManager
.
from_queryset
(
AbsenceQuerySet
)()
reason
=
models
.
ForeignKey
(
"
AbsenceReason
"
,
...
...
@@ -89,9 +91,9 @@ class Absence(FreeBusy):
@classmethod
def
get_objects
(
cls
,
request
:
HttpRequest
|
None
=
None
,
params
:
dict
[
str
,
any
]
|
None
=
None
cls
,
request
:
HttpRequest
|
None
=
None
,
params
:
dict
[
str
,
any
]
|
None
=
None
,
**
kwargs
)
->
QuerySet
:
qs
=
super
().
get_objects
(
request
,
params
).
select_related
(
"
person
"
,
"
reason
"
)
qs
=
super
().
get_objects
(
request
,
params
,
**
kwargs
).
select_related
(
"
person
"
,
"
reason
"
)
if
params
:
if
params
.
get
(
"
person
"
):
qs
=
qs
.
filter
(
person_id
=
params
[
"
person
"
])
...
...
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