Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed bugs caused by merging

Browse Source
This commit is contained in:
Rocky Duan
2012-08-14 13:43:04 -07:00
parent eb47093b1c
commit 04387289fa
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/lib/xmodule/xmodule/discussion_module.py
View File

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

2
lms/djangoapps/courseware/views.py
View File

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

6
lms/djangoapps/django_comment_client/forum/views.py
View File

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

1
lms/static/sass/_discussion.scss
View File

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