fixed bugs caused by merging

common/lib/xmodule/xmodule/discussion_module.py

@@ -17,8 +17,8 @@ class DiscussionModule(XModule):
         }
         return self.system.render_template('discussion/_discussion_module.html', context)
 
-    def __init__(self, system, location, definition, instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, instance_state, shared_state, **kwargs)
+    def __init__(self, system, location, definition, descriptor, instance_state=None, shared_state=None, **kwargs):
+        XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
 
         if isinstance(instance_state, str):
             instance_state = json.loads(instance_state)

lms/djangoapps/courseware/views.py

@@ -268,7 +268,7 @@ def render_notifications(request, course, notifications):
 
 @login_required
 def news(request, course_id):
-    course = check_course(course_id)
+    course = check_course(request.user, course_id)
 
     notifications = comment_client.get_notifications(request.user.id)
 

lms/djangoapps/django_comment_client/forum/views.py

@@ -120,7 +120,7 @@ def render_search_bar(request, course_id, discussion_id=None, text=''):
     return render_to_string('discussion/_search_bar.html', context)
 
 def forum_form_discussion(request, course_id, discussion_id):
-    course = check_course(course_id)
+    course = check_course(request.user, course_id)
     threads, query_params = get_threads(request, course_id, discussion_id)
     content = render_forum_discussion(request, course_id, threads, discussion_id=discussion_id, \
                                                                    query_params=query_params)
@@ -183,7 +183,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
         })
 
     else:
-        course = check_course(course_id)
+        course = check_course(request.user, course_id)
 
         context = {
             'discussion_id': discussion_id,
@@ -198,7 +198,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
 
 def search(request, course_id):
 
-    course = check_course(course_id)
+    course = check_course(request.user, course_id)
 
     text = request.GET.get('text', None)
     commentable_id = request.GET.get('commentable_id', None)

lms/static/sass/_discussion.scss

@@ -106,6 +106,7 @@ $tag-text-color: #5b614f;
 
     .discussion-sidebar-tags-list li {
       @include clearfix;
+      border-bottom: none;
     }
 
     .sidebar-tag-count {