github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 12:53:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Dismissing unread not dismissing correctly (#26096)

Browse Source 
Why this change?

This is a regression from introduced in
5c1147adf3 where dismissing unread topics
was changing the notification level of the topics instead of just
dismissing the unread posts.

What does this change do?

1. Bring back the previous implementation of the action
2. Fix the system test that was supposed to catch the problem but did
   not.
This commit is contained in:
Alan Guo Xiang Tan 2024-03-08 09:02:35 +08:00 committed by GitHub
parent 33b5a8448e
commit 05653e11cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/controllers/discovery/list.js
View File

@ -201,7 +201,13 @@ export default class DiscoveryListController extends Controller {
}
@action
dismissRead(operationType, options) {
this.bulkSelectHelper.dismissRead(operationType, options);
dismissRead(dismissTopics) {
const operationType = dismissTopics ? "topics" : "posts";
this.bulkSelectHelper.dismissRead(operationType, {
categoryId: this.model.category?.id,
tagName: this.model.tag?.id,
includeSubcategories: this.model.noSubcategories,
});
}
}

4
spec/system/page_objects/components/topic_list_controls.rb
View File

@ -11,7 +11,7 @@ module PageObjects
I18n.t("js.filters.new.title_with_count", count: count)
end
has_css?(".nav-item_new", text: text)
has_css?(".nav-item_new", exact_text: text)
end
def has_unread?(count:)
@ -22,7 +22,7 @@ module PageObjects
I18n.t("js.filters.unread.title_with_count", count: count)
end
has_css?(".nav-item_unread", text: text)
has_css?(".nav-item_unread", exact_text: text)
end
def dismiss_unread(untrack: false)