github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:01:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Remove limit on dismissing unread and new messages.

Browse Source 
Follow-up to 2c046cc670161e3b9f998edcc7500d18bcfd8f9a
This commit is contained in:
Alan Guo Xiang Tan
2021-08-05 14:44:58 +08:00
parent bfe24f74e1
commit 3f59ccefd7
2 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/topics_controller.rb
View File

@ -958,6 +958,7 @@ class TopicsController < ApplicationController
params.require(:inbox)
inbox = params[:inbox].to_s
filter = private_message_filter(topic_query, inbox)
topic_query.options[:limit] = false
topic_scope = topic_query.filter_private_message_new(current_user, filter)
end
@ -1233,6 +1234,7 @@ class TopicsController < ApplicationController
if inbox = params[:private_message_inbox]
filter = private_message_filter(topic_query, inbox)
topic_query.options[:limit] = false
topics = topic_query.filter_private_messages_unread(current_user, filter)
else
topics = TopicQuery.unread_filter(topic_query.joined_topic_user, staff: guardian.is_staff?).listable_topics