Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hackinscience
hkis-website
Commits
c57b2d99
Unverified
Commit
c57b2d99
authored
Oct 05, 2021
by
Julien Palard
Browse files
admin: FIX: filtering on exercises and filtering on users is not the same.
parent
8d30d5c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/admin.py
View file @
c57b2d99
from
django
import
forms
from
django.core.exceptions
import
FieldError
from
django.contrib
import
admin
from
django.contrib.auth.admin
import
UserAdmin
from
django.utils.safestring
import
mark_safe
...
...
@@ -186,8 +187,12 @@ class TeamFilter(admin.SimpleListFilter):
return
[(
team
.
id
,
team
.
name
)
for
team
in
Team
.
objects
.
my_teams
(
request
.
user
)]
def
queryset
(
self
,
request
,
queryset
):
if
self
.
value
()
is
not
None
:
return
queryset
.
filter
(
user__teams
=
self
.
value
())
try
:
# to filter on objects having a user property:
if
self
.
value
()
is
not
None
:
return
queryset
.
filter
(
user__teams
=
self
.
value
())
except
FieldError
:
# to filter on users
if
self
.
value
()
is
not
None
:
return
queryset
.
filter
(
teams
=
self
.
value
())
class
MyExercisesFilter
(
admin
.
SimpleListFilter
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment