Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ def create_thread(request, course_id, commentable_id):

if follow:
cc_user = cc.User.from_django_user(user)
cc_user.follow(thread)
cc_user.follow(thread, course_id)
thread_followed.send(sender=None, user=user, post=thread)

data = thread.to_dict()
Expand Down
8 changes: 4 additions & 4 deletions lms/djangoapps/discussion/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def get_threads(request, course, user_info, discussion_id=None, per_page=THREADS
# If the user clicked a sort key, update their default sort key
cc_user = cc.User.from_django_user(request.user)
cc_user.default_sort_key = request.GET.get('sort_key')
cc_user.save(params={"course_id": course.id})
cc_user.save(params={"course_id": str(course.id)})

#there are 2 dimensions to consider when executing a search with respect to group id
#is user a moderator
Expand Down Expand Up @@ -219,7 +219,7 @@ def inline_discussion(request, course_key, discussion_id):
with function_trace('get_course_and_user_info'):
course = get_course_with_access(request.user, 'load', course_key, check_if_enrolled=True)
cc_user = cc.User.from_django_user(request.user)
user_info = cc_user.to_dict()
user_info = cc_user.to_dict(course_key=str(course_key))

try:
with function_trace('get_threads'):
Expand Down Expand Up @@ -357,7 +357,7 @@ def single_thread(request, course_key, discussion_id, thread_id):

if request.headers.get('x-requested-with') == 'XMLHttpRequest':
cc_user = cc.User.from_django_user(request.user)
user_info = cc_user.to_dict()
user_info = cc_user.to_dict(course_key=str(course_key))
is_staff = has_permission(request.user, 'openclose_thread', course.id)

try:
Expand Down Expand Up @@ -472,7 +472,7 @@ def _create_base_discussion_view_context(request, course_key):
"""
user = request.user
cc_user = cc.User.from_django_user(user)
user_info = cc_user.to_dict()
user_info = cc_user.to_dict(course_key=str(course_key))
course = get_course_with_access(user, 'load', course_key, check_if_enrolled=True)
course_settings = make_course_settings(course, user)
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ def items(self, *args, **kwargs):
def get(self, *args, **kwargs):
return self.attributes.get(*args, **kwargs)

def to_dict(self):
self.retrieve()
def to_dict(self, course_key=None):
self.retrieve(course_key=course_key)
return self.attributes

def retrieve(self, *args, **kwargs):
Expand All @@ -72,7 +72,7 @@ def retrieve(self, *args, **kwargs):
return self

def _retrieve(self, *args, **kwargs):
course_id = self.attributes.get("course_id") or kwargs.get("course_id")
course_id = self.attributes.get("course_id") or kwargs.get("course_key")
if course_id:
course_key = get_course_key(course_id)
use_forumv2 = is_forum_v2_enabled(course_key)
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ openedx-filters==2.0.1
# -r requirements/edx/kernel.in
# lti-consumer-xblock
# ora2
openedx-forum==0.1.9
openedx-forum==0.2.0
# via -r requirements/edx/kernel.in
openedx-learning==0.19.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ openedx-filters==2.0.1
# -r requirements/edx/testing.txt
# lti-consumer-xblock
# ora2
openedx-forum==0.1.9
openedx-forum==0.2.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ openedx-filters==2.0.1
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
openedx-forum==0.1.9
openedx-forum==0.2.0
# via -r requirements/edx/base.txt
openedx-learning==0.19.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ openedx-filters==2.0.1
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
openedx-forum==0.1.9
openedx-forum==0.2.0
# via -r requirements/edx/base.txt
openedx-learning==0.19.2
# via
Expand Down