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
cda23bc0
Commit
cda23bc0
authored
Dec 05, 2017
by
Simon Chen
Committed by
Feanil Patel
Dec 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow video object override on course_run level
parent
672cb7bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletions
+11
-1
course_discovery/apps/api/serializers.py
+1
-1
course_discovery/apps/course_metadata/models.py
+4
-0
course_discovery/apps/course_metadata/tests/test_models.py
+6
-0
No files found.
course_discovery/apps/api/serializers.py
View file @
cda23bc0
...
@@ -507,7 +507,7 @@ class CourseRunSerializer(MinimalCourseRunSerializer):
...
@@ -507,7 +507,7 @@ class CourseRunSerializer(MinimalCourseRunSerializer):
help_text
=
_
(
'Language in which the course is administered'
)
help_text
=
_
(
'Language in which the course is administered'
)
)
)
transcript_languages
=
serializers
.
SlugRelatedField
(
many
=
True
,
read_only
=
True
,
slug_field
=
'code'
)
transcript_languages
=
serializers
.
SlugRelatedField
(
many
=
True
,
read_only
=
True
,
slug_field
=
'code'
)
video
=
VideoSerializer
()
video
=
VideoSerializer
(
source
=
'get_video'
)
seats
=
SeatSerializer
(
many
=
True
)
seats
=
SeatSerializer
(
many
=
True
)
instructors
=
serializers
.
SerializerMethodField
(
help_text
=
'This field is deprecated. Use staff.'
)
instructors
=
serializers
.
SerializerMethodField
(
help_text
=
'This field is deprecated. Use staff.'
)
staff
=
PersonSerializer
(
many
=
True
)
staff
=
PersonSerializer
(
many
=
True
)
...
...
course_discovery/apps/course_metadata/models.py
View file @
cda23bc0
...
@@ -731,6 +731,10 @@ class CourseRun(TimeStampedModel):
...
@@ -731,6 +731,10 @@ class CourseRun(TimeStampedModel):
else
:
else
:
return
_
(
'Upcoming'
)
return
_
(
'Upcoming'
)
@property
def
get_video
(
self
):
return
self
.
video
or
self
.
course
.
video
@classmethod
@classmethod
def
search
(
cls
,
query
):
def
search
(
cls
,
query
):
""" Queries the search index.
""" Queries the search index.
...
...
course_discovery/apps/course_metadata/tests/test_models.py
View file @
cda23bc0
...
@@ -356,6 +356,12 @@ class CourseRunTests(TestCase):
...
@@ -356,6 +356,12 @@ class CourseRunTests(TestCase):
def
test_image_url
(
self
):
def
test_image_url
(
self
):
assert
self
.
course_run
.
image_url
==
self
.
course_run
.
course
.
image_url
assert
self
.
course_run
.
image_url
==
self
.
course_run
.
course
.
image_url
def
test_get_video
(
self
):
assert
self
.
course_run
.
get_video
==
self
.
course_run
.
video
self
.
course_run
.
video
=
None
self
.
course_run
.
save
()
assert
self
.
course_run
.
get_video
==
self
.
course_run
.
course
.
video
@ddt.ddt
@ddt.ddt
class
OrganizationTests
(
TestCase
):
class
OrganizationTests
(
TestCase
):
...
...
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