Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation

Conflicts:
	lms/urls.py

lms/djangoapps/django_comment_client/utils.py

@@ -65,7 +65,7 @@ def initialize_discussion_info(request, course):
 
     def _get_module(module_descriptor):
         print module_descriptor
-        module = get_module(user, request, module_descriptor.location, student_module_cache)[0]
+        module = get_module(user, request, module_descriptor.location, student_module_cache)
         return module
 
     def _extract_info(module):
@@ -82,7 +82,7 @@ def initialize_discussion_info(request, course):
                                         filter(_is_course_discussion,
                                                get_full_modules().items()))
 
-    student_module_cache = StudentModuleCache(user, course)
+    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(user, course)
 
     discussion_info = map(_extract_info, map(_get_module, discussion_module_descriptors))
 

lms/templates/discussion/_search_bar.html

@@ -9,7 +9,7 @@ def base_url_for_search():
 %>
 
 <form action="${base_url_for_search()}" method="get" class="discussion-search-form">
-  % if 'tag' in query_params:
+  % if query_params.get('tags', None):
     <input class="search-input" type="text" value="[${tags}]${text}" id="keywords" autocomplete="off"/>
   % else:
     <input class="search-input" type="text" value="[${tags}]${text}" id="keywords" autocomplete="off"/>

lms/urls.py

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