Skip to content

Commit 490aae8

Browse files
taimoor-ahmed-1Taimoor  Ahmed
authored andcommitted
fix: legacy forum issues (#36470)
Co-authored-by: Taimoor Ahmed <taimoor.ahmed@A006-01434.local>
1 parent e21b97f commit 490aae8

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

lms/djangoapps/discussion/django_comment_client/base/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ def create_thread(request, course_id, commentable_id):
584584

585585
if follow:
586586
cc_user = cc.User.from_django_user(user)
587-
cc_user.follow(thread)
587+
cc_user.follow(thread, course_id)
588588
thread_followed.send(sender=None, user=user, post=thread)
589589

590590
data = thread.to_dict()

lms/djangoapps/discussion/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def get_threads(request, course, user_info, discussion_id=None, per_page=THREADS
147147
# If the user clicked a sort key, update their default sort key
148148
cc_user = cc.User.from_django_user(request.user)
149149
cc_user.default_sort_key = request.GET.get('sort_key')
150-
cc_user.save(params={"course_id": course.id})
150+
cc_user.save(params={"course_id": str(course.id)})
151151

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

224224
try:
225225
with function_trace('get_threads'):
@@ -357,7 +357,7 @@ def single_thread(request, course_key, discussion_id, thread_id):
357357

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

363363
try:
@@ -472,7 +472,7 @@ def _create_base_discussion_view_context(request, course_key):
472472
"""
473473
user = request.user
474474
cc_user = cc.User.from_django_user(user)
475-
user_info = cc_user.to_dict()
475+
user_info = cc_user.to_dict(course_key=str(course_key))
476476
course = get_course_with_access(user, 'load', course_key, check_if_enrolled=True)
477477
course_settings = make_course_settings(course, user)
478478
return {

openedx/core/djangoapps/django_comment_common/comment_client/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ def items(self, *args, **kwargs):
6161
def get(self, *args, **kwargs):
6262
return self.attributes.get(*args, **kwargs)
6363

64-
def to_dict(self):
65-
self.retrieve()
64+
def to_dict(self, course_key=None):
65+
self.retrieve(course_key=course_key)
6666
return self.attributes
6767

6868
def retrieve(self, *args, **kwargs):
@@ -72,7 +72,7 @@ def retrieve(self, *args, **kwargs):
7272
return self
7373

7474
def _retrieve(self, *args, **kwargs):
75-
course_id = self.attributes.get("course_id") or kwargs.get("course_id")
75+
course_id = self.attributes.get("course_id") or kwargs.get("course_key")
7676
if course_id:
7777
course_key = get_course_key(course_id)
7878
use_forumv2 = is_forum_v2_enabled(course_key)

requirements/edx/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ openedx-filters==2.0.1
818818
# -r requirements/edx/kernel.in
819819
# lti-consumer-xblock
820820
# ora2
821-
openedx-forum==0.1.9
821+
openedx-forum==0.2.0
822822
# via -r requirements/edx/kernel.in
823823
openedx-learning==0.19.2
824824
# via

requirements/edx/development.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ openedx-filters==2.0.1
13791379
# -r requirements/edx/testing.txt
13801380
# lti-consumer-xblock
13811381
# ora2
1382-
openedx-forum==0.1.9
1382+
openedx-forum==0.2.0
13831383
# via
13841384
# -r requirements/edx/doc.txt
13851385
# -r requirements/edx/testing.txt

requirements/edx/doc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ openedx-filters==2.0.1
990990
# -r requirements/edx/base.txt
991991
# lti-consumer-xblock
992992
# ora2
993-
openedx-forum==0.1.9
993+
openedx-forum==0.2.0
994994
# via -r requirements/edx/base.txt
995995
openedx-learning==0.19.2
996996
# via

requirements/edx/testing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ openedx-filters==2.0.1
10481048
# -r requirements/edx/base.txt
10491049
# lti-consumer-xblock
10501050
# ora2
1051-
openedx-forum==0.1.9
1051+
openedx-forum==0.2.0
10521052
# via -r requirements/edx/base.txt
10531053
openedx-learning==0.19.2
10541054
# via

0 commit comments

Comments
 (0)