split_node_tags: Merge changes from main branch.

[rails.git] / app / controllers / message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index b54fdf9d131db521ed3c8b6a40b4156393b6dc35..395d56028999d92a99a70e4b20d020942aa0d1d9 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -20,6 +20,26 @@ 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 ])
+    title = message.title.sub(/^Re:\s*/, "Re: ")
+    redirect_to :action => 'new', :user_id => message.from_user_id, :title => title
+  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 ])