Merge pull request #3856 from cpennington/ok-merge-from-master

Merge from master to opaque-keys
2014-05-23 11:42:26 -04:00
parent 9feff62857 8c8cf4705a
commit 05ca40b4f9
1 changed files with 1 additions and 0 deletions
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -507,6 +507,7 @@ def get_module_system_for_user(user, field_data_cache,
        )

    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'))

    # make an ErrorDescriptor -- assuming that the descriptor's system is ok
    if has_access(user, u'staff', descriptor.location, course_id):