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
a707541d
Commit
a707541d
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '198-remove-references-to-is_active-parameter' into 'master'
Resolve "Remove references to is_active parameter" Closes
#198
See merge request
!259
parents
5a9b45a6
cb69ec58
No related branches found
No related tags found
1 merge request
!259
Resolve "Remove references to is_active parameter"
Pipeline
#49473
passed
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/alsijil/model_extensions.py
+0
-1
0 additions, 1 deletion
aleksis/apps/alsijil/model_extensions.py
aleksis/apps/alsijil/views.py
+1
-1
1 addition, 1 deletion
aleksis/apps/alsijil/views.py
with
1 addition
and
2 deletions
aleksis/apps/alsijil/model_extensions.py
+
0
−
1
View file @
a707541d
...
...
@@ -154,7 +154,6 @@ def get_personal_notes(
no_personal_notes
=~
Exists
(
PersonalNote
.
objects
.
filter
(
person__pk
=
OuterRef
(
"
pk
"
),
**
q_attrs
))
).
filter
(
member_of__in
=
Group
.
objects
.
filter
(
pk__in
=
self
.
get_groups
().
all
()),
is_active
=
True
,
no_personal_notes
=
True
,
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/views.py
+
1
−
1
View file @
a707541d
...
...
@@ -428,7 +428,7 @@ def week_view(
if
lesson_periods_pk
or
events_pk
or
extra_lessons_pk
:
# Aggregate all personal notes for this group and week
persons_qs
=
Person
.
objects
.
filter
(
is_active
=
True
)
persons_qs
=
Person
.
objects
.
all
(
)
if
not
request
.
user
.
has_perm
(
"
alsijil.view_week_personalnote_rule
"
,
instance
):
persons_qs
=
persons_qs
.
filter
(
pk
=
request
.
user
.
person
.
pk
)
...
...
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