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
6ed41b22
Commit
6ed41b22
authored
May 01, 2015
by
Will Daly
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7885 from edx/will/credit-through-enrollment-api
Enrollment API course details include credit modes.
parents
270ac747
5d16ed46
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletions
+20
-1
common/djangoapps/enrollment/serializers.py
+3
-1
common/djangoapps/enrollment/tests/test_views.py
+17
-0
No files found.
common/djangoapps/enrollment/serializers.py
View file @
6ed41b22
...
...
@@ -40,7 +40,9 @@ class CourseField(serializers.RelatedField):
def
to_native
(
self
,
course
):
course_id
=
unicode
(
course
.
id
)
course_modes
=
ModeSerializer
(
CourseMode
.
modes_for_course
(
course
.
id
))
.
data
# pylint: disable=no-member
course_modes
=
ModeSerializer
(
CourseMode
.
modes_for_course
(
course
.
id
,
only_selectable
=
False
)
)
.
data
# pylint: disable=no-member
return
{
"course_id"
:
course_id
,
...
...
common/djangoapps/enrollment/tests/test_views.py
View file @
6ed41b22
...
...
@@ -306,6 +306,23 @@ class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase):
self
.
assertEqual
(
mode
[
'sku'
],
'123'
)
self
.
assertEqual
(
mode
[
'name'
],
CourseMode
.
HONOR
)
def
test_get_course_details_with_credit_course
(
self
):
CourseModeFactory
.
create
(
course_id
=
self
.
course
.
id
,
mode_slug
=
CourseMode
.
CREDIT_MODE
,
mode_display_name
=
CourseMode
.
CREDIT_MODE
,
)
resp
=
self
.
client
.
get
(
reverse
(
'courseenrollmentdetails'
,
kwargs
=
{
"course_id"
:
unicode
(
self
.
course
.
id
)})
)
self
.
assertEqual
(
resp
.
status_code
,
status
.
HTTP_200_OK
)
data
=
json
.
loads
(
resp
.
content
)
self
.
assertEqual
(
unicode
(
self
.
course
.
id
),
data
[
'course_id'
])
mode
=
data
[
'course_modes'
][
0
]
self
.
assertEqual
(
mode
[
'slug'
],
CourseMode
.
CREDIT_MODE
)
self
.
assertEqual
(
mode
[
'name'
],
CourseMode
.
CREDIT_MODE
)
@ddt.data
(
# NOTE: Studio requires a start date, but this is not
# enforced at the data layer, so we need to handle the case
...
...
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