Skip to content

E
edx-platform
Commit 8c8cf470 by Calen Pennington
Options

Resolve conflicts

parent 6225f4d0
Showing with 1 additions and 5 deletions
lms/djangoapps/courseware/module_render.py
...@@ -506,12 +506,8 @@ def get_module_system_for_user(user, field_data_cache, ...@@ -506,12 +506,8 @@ def get_module_system_for_user(user, field_data_cache,
make_psychometrics_data_update_handler(course_id, user, descriptor.location) 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, u'staff', descriptor.location, course_id))
======= system.set(u'user_is_admin', has_access(user, u'staff', 'global'))
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
# make an ErrorDescriptor -- assuming that the descriptor's system is ok # make an ErrorDescriptor -- assuming that the descriptor's system is ok
if has_access(user, u'staff', descriptor.location, course_id): if has_access(user, u'staff', descriptor.location, course_id):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment