Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pylint fixes

Browse Source
This commit is contained in:
E. Kolpakov
2015-01-12 18:09:03 +03:00
committed by Braden MacDonald
parent 134a75b367
commit 195d5b57bc
26 changed files with 183 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/auth.py
View File

@@ -17,7 +17,7 @@ STUDIO_EDIT_ROLES = 8
STUDIO_VIEW_USERS = 4
STUDIO_EDIT_CONTENT = 2
STUDIO_VIEW_CONTENT = 1
# In addition to the above, one is always allowed to "demote" oneself to a lower role within a course, or remove oneself.
# In addition to the above, one is always allowed to "demote" oneself to a lower role within a course, or remove oneself
def has_access(user, role):
@@ -70,7 +70,7 @@ def get_user_permissions(user, course_key, org=None):
if OrgStaffRole(org=org).has_user(user) or (course_key and has_access(user, CourseStaffRole(course_key))):
return STUDIO_VIEW_USERS | STUDIO_EDIT_CONTENT | STUDIO_VIEW_CONTENT
# Otherwise, for libraries, users can view only:
if (course_key and isinstance(course_key, LibraryLocator)):
if course_key and isinstance(course_key, LibraryLocator):
if OrgLibraryUserRole(org=org).has_user(user) or has_access(user, LibraryUserRole(course_key)):
return STUDIO_VIEW_USERS | STUDIO_VIEW_CONTENT
return 0

2
common/djangoapps/terrain/ui_helpers.py
View File

@@ -48,7 +48,7 @@ REQUIREJS_WAIT = {
"js/base", "js/models/course", "js/models/location", "js/models/section"],
# Dashboard
# pylint disable=anomalous-backslash-in-string
# pylint: disable=anomalous-backslash-in-string
re.compile('^Studio Home \|'): [
"js/sock", "gettext", "js/base",
"jquery.ui", "coffee/src/main", "underscore"],