Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
course-discovery
Commits
146c2f0c
Commit
146c2f0c
authored
Apr 17, 2018
by
Bill Filler
Committed by
Matt Tuchfarber
Jun 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add filter and ordering support
parent
279062c0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletions
+26
-1
course_discovery/apps/journal/api/filters.py
+22
-0
course_discovery/apps/journal/api/v1/views.py
+4
-1
No files found.
course_discovery/apps/journal/api/filters.py
0 → 100644
View file @
146c2f0c
'''Filter class for Journals'''
from
course_discovery.apps.journal.models
import
Journal
from
course_discovery.apps.journal.choices
import
JournalStatus
from
django_filters
import
rest_framework
as
filters
class
CharListFilter
(
filters
.
CharFilter
):
""" Filters a field via a comma-delimited list of values. """
def
filter
(
self
,
qs
,
value
):
if
value
not
in
(
None
,
''
):
value
=
value
.
split
(
','
)
return
super
(
CharListFilter
,
self
)
.
filter
(
qs
,
value
)
class
JournalFilter
(
filters
.
FilterSet
):
status
=
filters
.
MultipleChoiceFilter
(
choices
=
JournalStatus
.
choices
)
orgs
=
CharListFilter
(
name
=
'organization__key'
,
lookup_expr
=
'in'
)
class
Meta
:
model
=
Journal
fields
=
(
'orgs'
,
'status'
,)
course_discovery/apps/journal/api/v1/views.py
View file @
146c2f0c
...
@@ -5,6 +5,7 @@ from rest_framework_extensions.cache.mixins import CacheResponseMixin
...
@@ -5,6 +5,7 @@ from rest_framework_extensions.cache.mixins import CacheResponseMixin
from
rest_framework.permissions
import
IsAuthenticated
from
rest_framework.permissions
import
IsAuthenticated
from
course_discovery.apps.journal.models
import
Journal
,
JournalBundle
from
course_discovery.apps.journal.models
import
Journal
,
JournalBundle
from
course_discovery.apps.journal.api.filters
import
JournalFilter
from
course_discovery.apps.journal.api.serializers
import
JournalSerializer
,
JournalBundleSerializer
from
course_discovery.apps.journal.api.serializers
import
JournalSerializer
,
JournalBundleSerializer
from
course_discovery.apps.journal
import
constants
as
journal_constants
from
course_discovery.apps.journal
import
constants
as
journal_constants
...
@@ -15,8 +16,10 @@ class JournalViewSet(viewsets.ModelViewSet):
...
@@ -15,8 +16,10 @@ class JournalViewSet(viewsets.ModelViewSet):
"""
"""
lookup_field
=
'uuid'
lookup_field
=
'uuid'
lookup_value_regex
=
journal_constants
.
UUID_PATTERN
lookup_value_regex
=
journal_constants
.
UUID_PATTERN
queryset
=
Journal
.
objects
.
all
()
queryset
=
Journal
.
objects
.
all
()
.
order_by
(
'-created'
)
serializer_class
=
JournalSerializer
serializer_class
=
JournalSerializer
filter_backends
=
(
DjangoFilterBackend
,)
filter_class
=
JournalFilter
class
JournalBundleViewSet
(
CacheResponseMixin
,
viewsets
.
ReadOnlyModelViewSet
):
class
JournalBundleViewSet
(
CacheResponseMixin
,
viewsets
.
ReadOnlyModelViewSet
):
...
...
Write
Preview
Markdown
is supported
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