X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f3bf0c8b14270f67e6ec860e58937f8d3c5887a1..138a9d97644d8cba566cf840edd524fc9947ac1a:/app/controllers/message_controller.rb diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index ba9e9f1e2..db40cc03f 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -110,10 +110,16 @@ class MessageController < ApplicationController if params[:message_id] id = params[:message_id] message = Message.find_by_id(id) - message.visible = false + message.from_user_visible = false if message.sender == @user + message.to_user_visible = false if message.recipient == @user if message.save flash[:notice] = t 'message.delete.deleted' - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + end end end rescue ActiveRecord::RecordNotFound