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
d84c3bd7
Commit
d84c3bd7
authored
Jun 15, 2015
by
Kyle McCormick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews
parent
1726c136
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
17 deletions
+20
-17
lms/djangoapps/courseware/access.py
+6
-4
lms/djangoapps/mobile_api/users/serializers.py
+12
-12
lms/djangoapps/mobile_api/users/views.py
+2
-1
No files found.
lms/djangoapps/courseware/access.py
View file @
d84c3bd7
...
...
@@ -663,17 +663,19 @@ def _has_staff_access_to_descriptor(user, descriptor, course_key):
return
_has_staff_access_to_location
(
user
,
descriptor
.
location
,
course_key
)
def
is_mobile_available_for_user
(
user
,
course
):
def
is_mobile_available_for_user
(
user
,
descriptor
):
"""
Returns whether the given course is mobile_available for the given user.
Checks:
mobile_available flag on the course
Beta User and staff access overrides the mobile_available flag
Arguments:
descriptor (CourseDescriptor|CourseOverview): course or overview of course in question
"""
return
(
course
.
mobile_available
or
auth
.
has_access
(
user
,
CourseBetaTesterRole
(
course
.
id
))
or
_has_staff_access_to_descriptor
(
user
,
course
,
course
.
id
)
descriptor
.
mobile_available
or
auth
.
has_access
(
user
,
CourseBetaTesterRole
(
descriptor
.
id
))
or
_has_staff_access_to_descriptor
(
user
,
descriptor
,
descriptor
.
id
)
)
...
...
lms/djangoapps/mobile_api/users/serializers.py
View file @
d84c3bd7
...
...
@@ -9,11 +9,11 @@ from student.models import CourseEnrollment, User
from
certificates.models
import
certificate_status_for_student
,
CertificateStatuses
class
CourseField
(
serializers
.
RelatedField
):
class
Course
Overview
Field
(
serializers
.
RelatedField
):
"""Custom field to wrap a CourseDescriptor object. Read-only."""
def
to_native
(
self
,
course
):
course_id
=
unicode
(
course
.
id
)
def
to_native
(
self
,
course
_overview
):
course_id
=
unicode
(
course
_overview
.
id
)
request
=
self
.
context
.
get
(
'request'
,
None
)
if
request
:
video_outline_url
=
reverse
(
...
...
@@ -38,14 +38,14 @@ class CourseField(serializers.RelatedField):
return
{
"id"
:
course_id
,
"name"
:
course
.
display_name
,
"number"
:
course
.
display_number_with_default
,
"org"
:
course
.
display_org_with_default
,
"start"
:
course
.
start
,
"end"
:
course
.
end
,
"course_image"
:
course_
image_url
(
course
)
,
"name"
:
course
_overview
.
display_name
,
"number"
:
course
_overview
.
display_number_with_default
,
"org"
:
course
_overview
.
display_org_with_default
,
"start"
:
course
_overview
.
start
,
"end"
:
course
_overview
.
end
,
"course_image"
:
course_
overview
.
course_image_url
,
"social_urls"
:
{
"facebook"
:
course
.
facebook_url
,
"facebook"
:
course
_overview
.
facebook_url
,
},
"latest_updates"
:
{
"video"
:
None
...
...
@@ -53,7 +53,7 @@ class CourseField(serializers.RelatedField):
"video_outline"
:
video_outline_url
,
"course_updates"
:
course_updates_url
,
"course_handouts"
:
course_handouts_url
,
"subscription_id"
:
course
.
clean_id
(
padding_char
=
'_'
),
"subscription_id"
:
course
_overview
.
clean_id
(
padding_char
=
'_'
),
}
...
...
@@ -61,7 +61,7 @@ class CourseEnrollmentSerializer(serializers.ModelSerializer):
"""
Serializes CourseEnrollment models
"""
course
=
Course
Field
(
)
course
=
Course
OverviewField
(
source
=
"course_overview"
)
certificate
=
serializers
.
SerializerMethodField
(
'get_certificate'
)
def
get_certificate
(
self
,
model
):
...
...
lms/djangoapps/mobile_api/users/views.py
View file @
d84c3bd7
...
...
@@ -241,7 +241,8 @@ class UserCourseEnrollmentsList(generics.ListAPIView):
)
.
order_by
(
'created'
)
.
reverse
()
return
[
enrollment
for
enrollment
in
enrollments
if
enrollment
.
course
and
is_mobile_available_for_user
(
self
.
request
.
user
,
enrollment
.
course
)
if
enrollment
.
course_overview
and
is_mobile_available_for_user
(
self
.
request
.
user
,
enrollment
.
course_overview
)
]
...
...
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