Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
947b8723
Unverified
Commit
947b8723
authored
Nov 13, 2017
by
Muhammad Ammar
Committed by
GitHub
Nov 13, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16539 from edx/ammar/pass-course-id-as-string
pass course id as string to edxval api method
parents
230b18db
d78557a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
cms/djangoapps/contentstore/tests/test_contentstore.py
+3
-3
cms/djangoapps/contentstore/views/videos.py
+1
-1
No files found.
cms/djangoapps/contentstore/tests/test_contentstore.py
View file @
947b8723
...
...
@@ -1930,7 +1930,7 @@ class RerunCourseTest(ContentStoreTestCase):
source_course
=
CourseFactory
.
create
()
destination_course_key
=
self
.
post_rerun_request
(
source_course
.
id
)
self
.
verify_rerun_course
(
source_course
.
id
,
destination_course_key
,
self
.
destination_course_data
[
'display_name'
])
videos
=
list
(
get_videos_for_course
(
destination_course_key
))
videos
=
list
(
get_videos_for_course
(
unicode
(
destination_course_key
)
))
self
.
assertEqual
(
0
,
len
(
videos
))
self
.
assertInCourseListing
(
destination_course_key
)
...
...
@@ -1949,8 +1949,8 @@ class RerunCourseTest(ContentStoreTestCase):
self
.
verify_rerun_course
(
source_course
.
id
,
destination_course_key
,
self
.
destination_course_data
[
'display_name'
])
# Verify that the VAL copies videos to the rerun
source_videos
=
list
(
get_videos_for_course
(
source_course
.
id
))
target_videos
=
list
(
get_videos_for_course
(
destination_course_key
))
source_videos
=
list
(
get_videos_for_course
(
unicode
(
source_course
.
id
)
))
target_videos
=
list
(
get_videos_for_course
(
unicode
(
destination_course_key
)
))
self
.
assertEqual
(
1
,
len
(
source_videos
))
self
.
assertEqual
(
source_videos
,
target_videos
)
...
...
cms/djangoapps/contentstore/views/videos.py
View file @
947b8723
...
...
@@ -526,7 +526,7 @@ def _get_videos(course):
"""
Retrieves the list of videos from VAL corresponding to this course.
"""
videos
=
list
(
get_videos_for_course
(
course
.
id
,
VideoSortField
.
created
,
SortDirection
.
desc
))
videos
=
list
(
get_videos_for_course
(
unicode
(
course
.
id
)
,
VideoSortField
.
created
,
SortDirection
.
desc
))
# convert VAL's status to studio's Video Upload feature status.
for
video
in
videos
:
...
...
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