Skip to content

fix: retrieve course ID when rendering DiscussionXBlock #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: retrieve course ID when rendering DiscussionXBlock #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5d2375
fix: retrieve course ID when rendering DiscussionXBlock
Agrendalath May 19, 2025
5df8ebe
fix: do not pass the `"None"` string to forum when `course_id` is not…
Agrendalath May 21, 2025
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
17 changes: 10 additions & 7 deletions openedx/core/djangoapps/django_comment_common/comment_client/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,13 @@ def save(self, params=None):

def delete(self, course_id=None):
course_key = get_course_key(self.attributes.get("course_id") or course_id)
course_id = str(course_key) if course_key else None
if is_forum_v2_enabled(course_key):
response = None
if self.type == "comment":
response = forum_api.delete_comment(comment_id=self.attributes["id"], course_id=str(course_key))
response = forum_api.delete_comment(comment_id=self.attributes["id"], course_id=course_id)
elif self.type == "thread":
response = forum_api.delete_thread(thread_id=self.attributes["id"], course_id=str(course_key))
response = forum_api.delete_thread(thread_id=self.attributes["id"], course_id=course_id)
if response is None:
raise CommentClientRequestError("Forum v2 API call is missing")
else:
Expand Down Expand Up @@ -224,15 +225,16 @@ def handle_update(self, params=None):
if params:
request_params.update(params)
course_id = self.attributes.get("course_id") or request_params.get("course_id")
course_id = str(course_id) if course_id else None
course_key = get_course_key(course_id)
if is_forum_v2_enabled(course_key):
response = None
if self.type == "comment":
response = self.handle_update_comment(request_params, str(course_key))
response = self.handle_update_comment(request_params, course_id)
elif self.type == "thread":
response = self.handle_update_thread(request_params, str(course_key))
response = self.handle_update_thread(request_params, course_id)
elif self.type == "user":
response = self.handle_update_user(request_params, str(course_key))
response = self.handle_update_user(request_params, course_id)
if response is None:
raise CommentClientRequestError("Forum v2 API call is missing")
else:
Expand Down Expand Up @@ -319,13 +321,14 @@ def perform_http_post_request(self):

def handle_create(self, params=None):
course_id = self.attributes.get("course_id") or params.get("course_id")
course_id = str(course_id) if course_id else None
course_key = get_course_key(course_id)
if is_forum_v2_enabled(course_key):
response = None
if self.type == "comment":
response = self.handle_create_comment(str(course_key))
response = self.handle_create_comment(course_id)
elif self.type == "thread":
response = self.handle_create_thread(str(course_key))
response = self.handle_create_thread(course_id)
if response is None:
raise CommentClientRequestError("Forum v2 API call is missing")
else:
Expand Down
2 changes: 1 addition & 1 deletion openedx/core/djangoapps/django_comment_common/comment_client/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def _retrieve(self, *args, **kwargs):
retrieve_params['group_id'] = self.group_id

# course key -> id conversation
course_id = retrieve_params.get('course_id')
course_id = retrieve_params.get('course_id') or kwargs.get("course_key")
if course_id:
course_id = str(course_id)
retrieve_params['course_id'] = course_id
Expand Down
Loading