X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8b62df8b9c847a0e29e570b3fff302b5f84cf9df..3bf13d9c43dfe2996ddfe0bd15916623e63be1a1:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index d8689c28a..52f38e9f6 100644
--- 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]
-      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'
+        Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
-      else
-        @message.errors.add("Sending message failed")
       end
-
     end
   end
 
@@ -33,7 +26,7 @@ class MessageController < ApplicationController
     @message.message_read = 1
     @message.save
   rescue ActiveRecord::RecordNotFound
-    render :none, :status => :not_found
+    render :nothing => true, :status => :not_found
   end
 
   def inbox