X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a47fcb08579b06dcd615af92d9e530033d8673dc..5daeb1b0632f03f6c93490452cf7cff174b353ca:/app/controllers/message_controller.rb diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index e79fe7461..85c0ac328 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -22,18 +22,6 @@ class MessageController < ApplicationController end end - def destroy - @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) - if !@message.message_read - flash[:notice] = 'Message not read and so not deleted' - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - else - flash[:notice] = "Message '#{@message.title}' deleted" - @message.destroy - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - end - end - def reply message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"