Fix the data config, so that the development database is not the same as the test...

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 395d56028999d92a99a70e4b20d020942aa0d1d9..85c0ac328f2fc0349bd733518f51dd343410a825 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -17,25 +17,17 @@ class MessageController < ApplicationController
         Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
-    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
+      @title = params[:title]
     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
+    @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
+    @title = "Re: #{message.title.sub(/^Re:\s*/, '')}"
+    @user_id = message.from_user_id
+    render :action => 'new'
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
   end