X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d736a158bee0ff17bdba30496b87e1bfe20e2910..86b4d1bc2c05a68053c7485217144a7fcf8ef4e8:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index b54fdf9d1..8aecef98e 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -20,6 +20,28 @@ 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 = "\n\nOn #{message.sent_on} #{message.sender.display_name} wrote:\n #{message.body}" 
+    @title = "Re: #{message.title}"
+    @user_id = message.from_user_id
+    render :action => 'new'
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found
+  end
+
   def read
     @title = 'read message'
     @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])