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

Resolve conflicts

Browse Source
This commit is contained in:
Calen Pennington
2014-05-23 11:39:17 -04:00
parent 6225f4d0bd
commit 8c8cf4705a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/djangoapps/courseware/module_render.py
View File

@@ -506,12 +506,8 @@ def get_module_system_for_user(user, field_data_cache,
make_psychometrics_data_update_handler(course_id, user, descriptor.location)
)
<<<<<<< HEAD
system.set(u'user_is_staff', has_access(user, u'staff', descriptor.location, course_id))
=======
system.set(u'user_is_staff', has_access(user, descriptor.location, u'staff', course_id))
system.set(u'user_is_admin', has_access(user, 'global', 'staff'))
>>>>>>> edx/master
system.set(u'user_is_admin', has_access(user, u'staff', 'global'))
# make an ErrorDescriptor -- assuming that the descriptor's system is ok
if has_access(user, u'staff', descriptor.location, course_id):