Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
72ae13b4
Commit
72ae13b4
authored
Mar 22, 2017
by
Luuk Scholten
Browse files
Merge branch 'fix/education-search' into 'master'
Fix search_fields in education app Closes
#359
See merge request
!416
parents
320ed980
59631ea9
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/education/admin.py
View file @
72ae13b4
...
...
@@ -24,7 +24,8 @@ class ExamAdmin(TranslatedModelAdmin):
list_display
=
(
'type'
,
'course'
,
'exam_date'
,
'uploader'
,
'accepted'
)
list_filter
=
(
'accepted'
,
'exam_date'
,
'type'
,)
search_fields
=
(
'course'
,
'uploader'
,)
search_fields
=
(
'name'
,
'uploader__first_name'
,
'uploader__last_name'
,
'course__name_nl'
,
'course__name_en'
,)
actions
=
[
'accept'
,
'reject'
]
def
accept
(
self
,
request
,
queryset
):
...
...
@@ -42,7 +43,8 @@ class ExamAdmin(TranslatedModelAdmin):
class
SummaryAdmin
(
TranslatedModelAdmin
):
list_display
=
(
'name'
,
'course'
,
'uploader'
,
'accepted'
)
list_filter
=
(
'accepted'
,)
search_fields
=
(
'name'
,
'course'
,
'uploader'
,)
search_fields
=
(
'name'
,
'uploader__first_name'
,
'uploader__last_name'
,
'course__name_nl'
,
'course__name_en'
,)
actions
=
[
'accept'
,
'reject'
]
def
accept
(
self
,
request
,
queryset
):
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment