fixes ticket 434

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index c266582f5633eda40c02596e6d1925e7cc312590..a95ad25b60e4eb1c9638fbbe23ca7494ee72d7ee 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -6,20 +6,42 @@ class MessageController < ApplicationController
 
   def new
     if params[:message]
 
   def new
     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
       body = params[:message][:body]
       title = params[:message][:title]
       message = Message.new
       message.body = body
       message.title = title

-      message.to_user_id = User.find_by_display_name(params[:display_name]).id
+      message.to_user_id = params[:user_id]
+      message.from_display_name = to_user.display_name

       message.from_user_id = @user.id
       message.sent_on = Time.now
       message.from_user_id = @user.id
       message.sent_on = Time.now

+   

       if message.save
         flash[:notice] = 'Message sent'
       else
         @message.errors.add("Sending message failed")
       end
       if message.save
         flash[:notice] = 'Message sent'
       else
         @message.errors.add("Sending message failed")
       end

-      
-   end
+
+    end
+  end
+
+  def read
+    if params[:message_id]
+      id = params[:message_id]
+      @message = Message.find_by_id(id)
+    end
+  end
+
+  def mark
+    if params[:message_id]
+      id = params[:message_id]
+      message = Message.find_by_id(id)
+      message.message_read = 1
+      if message.save
+        flash[:notice] = 'Message Marked as read'
+        redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+      end
+    end

   end
 end
   end
 end