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

Merge remote-tracking branch 'upstream/pull/4210'

Browse source
This commit is contained in:
Tom Hughes 2023-08-30 18:10:20 +01:00
commit a99450f558
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/messages_controller.rb
View file

@ -57,7 +57,7 @@ class MessagesController < ApplicationController
# Destroy the message.
def destroy
@message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:id])
@message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user.id)).find(params[:id])
@message.from_user_visible = false if @message.sender == current_user
@message.to_user_visible = false if @message.recipient == current_user
if @message.save && !request.xhr?
@ -109,7 +109,7 @@ class MessagesController < ApplicationController
# Set the message as being read or unread.
def mark
@message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
@message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user)).find(params[:message_id])
if params[:mark] == "unread"
message_read = false
notice = t ".as_unread"