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
22479ddb
Verified
Commit
22479ddb
authored
Feb 25, 2017
by
Sébastiaan Versteeg
Browse files
Improve education app filtering and searching
parent
08580021
Changes
2
Hide whitespace changes
Inline
Side-by-side
website/education/admin.py
View file @
22479ddb
...
...
@@ -15,13 +15,16 @@ admin.site.register(models.Category)
class
CourseAdmin
(
TranslatedModelAdmin
):
fields
=
(
'name'
,
'shorthand'
,
'course_code'
,
'ec'
,
'since'
,
'until'
,
'period'
,
'categories'
,
'old_courses'
)
list_filter
=
(
'categories'
,
'ec'
)
search_fields
=
(
'name'
,
'course_code'
)
@
admin
.
register
(
models
.
Exam
)
class
ExamAdmin
(
TranslatedModelAdmin
):
list_display
=
(
'type'
,
'course'
,
'exam_date'
,
'uploader'
,
'accepted'
)
list_filter
=
(
'accepted'
,
'exam_date'
,
'type'
)
list_filter
=
(
'accepted'
,
'exam_date'
,
'type'
,)
search_fields
=
(
'course'
,
'uploader'
,)
actions
=
[
'accept'
,
'reject'
]
def
accept
(
self
,
request
,
queryset
):
...
...
@@ -39,6 +42,7 @@ class ExamAdmin(TranslatedModelAdmin):
class
SummaryAdmin
(
TranslatedModelAdmin
):
list_display
=
(
'name'
,
'course'
,
'uploader'
,
'accepted'
)
list_filter
=
(
'accepted'
,)
search_fields
=
(
'name'
,
'course'
,
'uploader'
,)
actions
=
[
'accept'
,
'reject'
]
def
accept
(
self
,
request
,
queryset
):
...
...
website/education/models.py
View file @
22479ddb
...
...
@@ -78,7 +78,7 @@ class Course(models.Model, metaclass=ModelTranslateMeta):
verbose_name_plural
=
_
(
'courses'
)
class
Exam
(
models
.
Model
):
class
Exam
(
models
.
Model
,
metaclass
=
ModelTranslateMeta
):
EXAM_TYPES
=
(
(
'document'
,
_
(
'Document'
)),
(
'exam'
,
_
(
'Exam'
)),
...
...
@@ -146,7 +146,7 @@ class Exam(models.Model):
verbose_name_plural
=
_
(
'exams'
)
class
Summary
(
models
.
Model
):
class
Summary
(
models
.
Model
,
metaclass
=
ModelTranslateMeta
):
name
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
_
(
'summary name'
),
...
...
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