Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
3256ec2d
Commit
3256ec2d
authored
Nov 04, 2013
by
Greg Price
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1559 from edx/gprice/cs-commentable-ids-param
Avoid CS search endpoint for non-search queries
parents
471e439f
6bca7de4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
+7
-1
CHANGELOG.rst
+6
-0
lms/lib/comment_client/thread.py
+1
-1
No files found.
CHANGELOG.rst
View file @
3256ec2d
...
@@ -24,6 +24,12 @@ Blades: Fix bug when the speed can only be changed when the video is playing.
...
@@ -24,6 +24,12 @@ Blades: Fix bug when the speed can only be changed when the video is playing.
LMS: Change bulk email implementation to use less memory, and to better handle
LMS: Change bulk email implementation to use less memory, and to better handle
duplicate tasks in celery.
duplicate tasks in celery.
LMS: When a topic is selected in the forums navigation sidebar, fetch
the thread list using the /threads endpoint of the comments service
instead of /search/threads, which does not sort and paginate
correctly. This requires at least version 31ef160 of
cs_comments_service.
LMS: Improve forum error handling so that errors in the logs are
LMS: Improve forum error handling so that errors in the logs are
clearer and HTTP status codes from the comments service indicating
clearer and HTTP status codes from the comments service indicating
client error are correctly passed through to the client.
client error are correctly passed through to the client.
...
...
lms/lib/comment_client/thread.py
View file @
3256ec2d
...
@@ -34,7 +34,7 @@ class Thread(models.Model):
...
@@ -34,7 +34,7 @@ class Thread(models.Model):
'recursive'
:
False
}
'recursive'
:
False
}
params
=
merge_dict
(
default_params
,
strip_blank
(
strip_none
(
query_params
)))
params
=
merge_dict
(
default_params
,
strip_blank
(
strip_none
(
query_params
)))
if
query_params
.
get
(
'text'
)
or
query_params
.
get
(
'tags'
)
or
query_params
.
get
(
'commentable_ids'
)
:
if
query_params
.
get
(
'text'
)
or
query_params
.
get
(
'tags'
):
url
=
cls
.
url
(
action
=
'search'
)
url
=
cls
.
url
(
action
=
'search'
)
else
:
else
:
url
=
cls
.
url
(
action
=
'get_all'
,
params
=
extract
(
params
,
'commentable_id'
))
url
=
cls
.
url
(
action
=
'get_all'
,
params
=
extract
(
params
,
'commentable_id'
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment