X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26f6fdf82c93b0fd3198bb8929d5f20a4723bfe8..cfe08d42d69a7233838cfee7874b1852cb2c3db6:/app/controllers/messages_controller.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index e4d6c70d9..7d86796b1 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -88,6 +88,16 @@ class MessagesController < ApplicationController @title = @message.title + render :action => "new" + elsif message.sender == current_user + @message = Message.new( + :recipient => message.recipient, + :title => "Re: #{message.title.sub(/^Re:\s*/, '')}", + :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" + ) + + @title = @message.title + render :action => "new" else flash[:notice] = t ".wrong_user", :user => current_user.display_name @@ -117,7 +127,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 +138,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"