Merge rails_port_0.5

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index d8689c28a0fe7b2925929dcd5abb2bff9c32659e..52f38e9f6a1d3d4e166423b432b57ea9b6b4a7d7 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -7,23 +7,16 @@ class MessageController < ApplicationController
   def new
     @title = 'send message'
     if params[:message]
   def new
     @title = 'send message'
     if params[:message]

-      to_user = User.find(params[:user_id])
-      body = params[:message][:body]
-      title = params[:message][:title]
-      message = Message.new
-      message.body = body
-      message.title = title
-      message.to_user_id = params[:user_id]
-      message.from_user_id = @user.id
-      message.sent_on = Time.now
+      @message = Message.new(params[:message])
+      @message.to_user_id = params[:user_id]
+      @message.from_user_id = @user.id
+      @message.sent_on = Time.now

    
    

-      if message.save
+      if @message.save

         flash[:notice] = 'Message sent'
         flash[:notice] = 'Message sent'

+        Notifier::deliver_message_notification(@message)

         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name

-      else
-        @message.errors.add("Sending message failed")

       end
       end

-

     end
   end
 
     end
   end
 


@@ -33,7 +26,7 @@ class MessageController < ApplicationController
     @message.message_read = 1
     @message.save
   rescue ActiveRecord::RecordNotFound
     @message.message_read = 1
     @message.save
   rescue ActiveRecord::RecordNotFound

-    render :none, :status => :not_found
+    render :nothing => true, :status => :not_found

   end
 
   def inbox
   end
 
   def inbox