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
eb11c629
Commit
eb11c629
authored
Sep 20, 2016
by
wajeeha-khalid
Committed by
GitHub
Sep 20, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13431 from edx/jia/MA-2663
MA-2663: Donot mark thread unread on any action but creation
parents
d2f2c293
03f888b7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
lms/djangoapps/discussion_api/api.py
+5
-0
lms/djangoapps/discussion_api/tests/test_api.py
+1
-1
lms/djangoapps/discussion_api/tests/test_views.py
+3
-2
No files found.
lms/djangoapps/discussion_api/api.py
View file @
eb11c629
...
...
@@ -916,6 +916,11 @@ def update_thread(request, thread_id, update_data):
thread_edited
.
send
(
sender
=
None
,
user
=
request
.
user
,
post
=
cc_thread
)
api_thread
=
serializer
.
data
_do_extra_actions
(
api_thread
,
cc_thread
,
update_data
.
keys
(),
actions_form
,
context
,
request
)
# always return read as True (and therefore unread_comment_count=0) as reasonably
# accurate shortcut, rather than adding additional processing.
api_thread
[
'read'
]
=
True
api_thread
[
'unread_comment_count'
]
=
0
return
api_thread
...
...
lms/djangoapps/discussion_api/tests/test_api.py
View file @
eb11c629
...
...
@@ -2047,7 +2047,7 @@ class UpdateThreadTest(
"endorsed_comment_list_url"
:
None
,
"non_endorsed_comment_list_url"
:
None
,
"editable_fields"
:
[
"abuse_flagged"
,
"following"
,
"raw_body"
,
"read"
,
"title"
,
"topic_id"
,
"type"
,
"voted"
],
'read'
:
Fals
e
,
'read'
:
Tru
e
,
'has_endorsed'
:
False
,
'response_count'
:
0
}
...
...
lms/djangoapps/discussion_api/tests/test_views.py
View file @
eb11c629
...
...
@@ -833,7 +833,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
def
test_basic
(
self
):
self
.
register_get_user_response
(
self
.
user
)
self
.
register_thread
({
"created_at"
:
"Test Created Date"
,
"updated_at"
:
"Test Updated Date"
})
self
.
register_thread
({
"created_at"
:
"Test Created Date"
,
"updated_at"
:
"Test Updated Date"
,
"read"
:
True
})
request_data
=
{
"raw_body"
:
"Edited body"
}
response
=
self
.
request_patch
(
request_data
)
self
.
assertEqual
(
response
.
status_code
,
200
)
...
...
@@ -849,6 +849,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
"created_at"
:
"Test Created Date"
,
"updated_at"
:
"Test Updated Date"
,
"comment_count"
:
1
,
"read"
:
True
,
})
)
self
.
assertEqual
(
...
...
@@ -864,7 +865,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
"anonymous_to_peers"
:
[
"False"
],
"closed"
:
[
"False"
],
"pinned"
:
[
"False"
],
"read"
:
[
"
Fals
e"
],
"read"
:
[
"
Tru
e"
],
}
)
...
...
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