cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix marking muted messages as read/unread

Browse source
This commit is contained in:
Anton Khorev 2024-07-18 18:48:14 +03:00
parent 6bf3b453f9
commit 64dfb88ddf
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/messages_controller.rb
View file

@ -117,7 +117,7 @@ class MessagesController < ApplicationController
# Set the message as being read or unread.
def mark
@message = current_user.messages.find(params[:message_id])
@message = current_user.messages.unscope(:where => :muted).find(params[:message_id])
if params[:mark] == "unread"
message_read = false
notice = t ".as_unread"
@ -128,7 +128,11 @@ class MessagesController < ApplicationController
@message.message_read = message_read
if @message.save
flash[:notice] = notice
redirect_to inbox_messages_path, :status => :see_other
if @message.muted?
redirect_to muted_messages_path, :status => :see_other
else
redirect_to inbox_messages_path, :status => :see_other
end
end
rescue ActiveRecord::RecordNotFound
@title = t "messages.no_such_message.title"