Post-rebasing fixes to re-enable masquerading.

lms/djangoapps/courseware/module_render.py

@@ -183,6 +183,10 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
 
     See get_module() docstring for further details.
     """
+    # allow course staff to masquerade as student
+    if has_access(user, descriptor, 'staff', course_id):
+        setup_masquerade(request, True)
+
     track_function = make_track_function(request)
     xqueue_callback_url_prefix = get_xqueue_callback_url_prefix(request)
 
@@ -202,10 +206,6 @@ def get_module_for_descriptor_internal(user, descriptor, model_data_cache, cours
     See get_module() docstring for further details.
     """
 
-    # allow course staff to masquerade as student
-    if has_access(user, descriptor, 'staff', course_id):
-        setup_masquerade(request, True)
-
     # Short circuit--if the user shouldn't have access, bail without doing any work
     if not has_access(user, descriptor, 'load', course_id):
         return None

lms/urls.py

@@ -58,7 +58,7 @@ urlpatterns = ('',  # nopep8
         name='auth_password_reset_done'),
 
     url(r'^heartbeat$', include('heartbeat.urls')),
-    url(r'^course_task_log_status/$', 'courseware.tasks.course_task_log_status', name='course_task_log_status'),
+    url(r'^course_task_log_status/$', 'courseware.task_queue.course_task_log_status', name='course_task_log_status'),
 )
 
 # University profiles only make sense in the default edX context