Merge branch 'ccp0101/moderation' into lol

Conflicts:
	lms/urls.py

cms/envs/common.py

@@ -121,6 +121,7 @@ MIDDLEWARE_CLASSES = (
 )
 
 ############################ SIGNAL HANDLERS ################################
+# This is imported to register the exception signal handling that logs exceptions
 import monitoring.exceptions  # noqa
 
 ############################ DJANGO_BUILTINS ################################

common/djangoapps/util/middleware.py

-import logging
-
-from django.conf import settings
-from django.http import HttpResponseServerError
-
-log = logging.getLogger("mitx")
-
-
-class ExceptionLoggingMiddleware(object):
-    """Just here to log unchecked exceptions that go all the way up the Django
-    stack"""
-
-    if not settings.TEMPLATE_DEBUG:
-        def process_exception(self, request, exception):
-            log.exception(exception)
-            return HttpResponseServerError("Server Error - Please try again later.")

lms/djangoapps/courseware/module_render.py

@@ -142,7 +142,7 @@ def get_module(user, request, location, student_module_cache, position=None):
         shared_module = None
         
 
-    instance_state = instance_module.state if instance_module is not None else {}
+    instance_state = instance_module.state if instance_module is not None else '{}'
     shared_state = shared_module.state if shared_module is not None else None
 
     # TODO (vshnayder): fix hardcoded urls (use reverse)

lms/envs/common.py

@@ -174,6 +174,9 @@ MODULESTORE = {
     }
 }
 
+############################ SIGNAL HANDLERS ################################
+# This is imported to register the exception signal handling that logs exceptions
+import monitoring.exceptions  # noqa
 
 ############################### DJANGO BUILT-INS ###############################
 # Change DEBUG/TEMPLATE_DEBUG in your environment settings files, not here
@@ -286,7 +289,6 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-    'util.middleware.ExceptionLoggingMiddleware',
     'django_comment_client.middleware.AjaxExceptionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

lms/templates/staff_problem_info.html

@@ -2,14 +2,14 @@ ${module_content}
 %if edit_link:
 <div><a href="${edit_link}">Edit</a></div>
 % endif
+<div><a href="javascript:void(0)" onclick="javascript:$('#${element_id}_debug').slideToggle()">Staff Debug Info</a></div>
 
-<div class="staff_info">
-<a href="javascript:void(0)" onclick="javascript:$('#${element_id}_debug').toggle()">Staff Debug Info</a>
 <span style="display:none" id="${element_id}_debug">
+<div class="staff_info">
 definition = <pre>${definition | h}</pre>
 metadata = ${metadata | h}
-</span>
 </div>
 %if render_histogram:
 <div id="histogram_${element_id}" class="histogram" data-histogram="${histogram}"></div>
 %endif
+</span>

lms/urls.py

@@ -142,7 +142,6 @@ if settings.COURSEWARE_ENABLED:
         # discussion
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/discussion/',
             include('django_comment_client.urls')),
-        
         # For the instructor
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/gradebook$',
             'courseware.views.gradebook'),