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
1c387e4f
Commit
1c387e4f
authored
Dec 10, 2015
by
Usman Khalid
Committed by
muzaffaryousaf
Dec 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review feedback.
parent
8bdc0972
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
lms/djangoapps/courseware/module_render.py
+0
-1
lms/static/js/bookmarks/collections/bookmarks.js
+2
-2
openedx/core/djangoapps/user_api/urls.py
+5
-6
No files found.
lms/djangoapps/courseware/module_render.py
View file @
1c387e4f
...
...
@@ -716,7 +716,6 @@ def get_module_system_for_user(user, student_data, # TODO # pylint: disable=to
"reverification"
:
ReverificationService
(),
'proctoring'
:
ProctoringService
(),
'credit'
:
CreditService
(),
'reverification'
:
ReverificationService
(),
'bookmarks'
:
BookmarksService
(
user
=
user
),
},
get_user_role
=
lambda
:
get_user_role
(
user
,
course_id
),
...
...
lms/static/js/bookmarks/collections/bookmarks.js
View file @
1c387e4f
...
...
@@ -26,4 +26,5 @@
});
});
})(
define
||
RequireJS
.
define
);
\ No newline at end of file
})(
define
||
RequireJS
.
define
);
openedx/core/djangoapps/user_api/urls.py
View file @
1c387e4f
...
...
@@ -2,33 +2,32 @@
Defines the URL routes for this app.
"""
from
django.conf
import
settings
from
django.conf.urls
import
patterns
,
url
from
..profile_images.views
import
ProfileImageView
from
.accounts.views
import
AccountView
from
.preferences.views
import
PreferencesView
,
PreferencesDetailView
USERNAME_PATTERN
=
r'(?P<username>[\w.+-]+)'
urlpatterns
=
patterns
(
''
,
url
(
r'^v1/accounts/{}$'
.
format
(
USERNAME_PATTERN
),
r'^v1/accounts/{}$'
.
format
(
settings
.
USERNAME_PATTERN
),
AccountView
.
as_view
(),
name
=
"accounts_api"
),
url
(
r'^v1/accounts/{}/image$'
.
format
(
USERNAME_PATTERN
),
r'^v1/accounts/{}/image$'
.
format
(
settings
.
USERNAME_PATTERN
),
ProfileImageView
.
as_view
(),
name
=
"accounts_profile_image_api"
),
url
(
r'^v1/preferences/{}$'
.
format
(
USERNAME_PATTERN
),
r'^v1/preferences/{}$'
.
format
(
settings
.
USERNAME_PATTERN
),
PreferencesView
.
as_view
(),
name
=
"preferences_api"
),
url
(
r'^v1/preferences/{}/(?P<preference_key>[a-zA-Z0-9_]+)$'
.
format
(
USERNAME_PATTERN
),
r'^v1/preferences/{}/(?P<preference_key>[a-zA-Z0-9_]+)$'
.
format
(
settings
.
USERNAME_PATTERN
),
PreferencesDetailView
.
as_view
(),
name
=
"preferences_detail_api"
),
...
...
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