Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Merge requests
!36
Make changes in GREG-28 work with the changes from GREG-26.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Make changes in GREG-28 work with the changes from GREG-26.
GREG-28-rebase
into
master
Overview
0
Commits
1
Pipelines
1
Changes
2
Merged
Jonas Braathen
requested to merge
GREG-28-rebase
into
master
3 years ago
Overview
0
Commits
1
Pipelines
1
Changes
2
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
52be83b2
1 commit,
3 years ago
2 files
+
7
−
7
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
greg/api/filters.py
+
3
−
3
Options
@@ -38,9 +38,9 @@ class PersonFilter(FilterSet):
@@ -38,9 +38,9 @@ class PersonFilter(FilterSet):
return
queryset
.
annotate
(
return
queryset
.
annotate
(
active
=
Case
(
active
=
Case
(
When
(
When
(
Q
(
person_
roles__start_date__isnull
=
True
)
Q
(
roles__start_date__isnull
=
True
)
|
Q
(
person_
roles__start_date__lte
=
datetime_now
),
|
Q
(
roles__start_date__lte
=
datetime_now
),
person_
roles__end_date__gte
=
datetime_now
,
roles__end_date__gte
=
datetime_now
,
then
=
True
,
then
=
True
,
),
),
default
=
False
,
default
=
False
,
Loading