Fixed error handling in the name search and tidied things up a bit.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index a2245ce8612c103aafacf4d628e7e5bdb9bc1907..a712931c554f8343a74d1e17e8d281100c126501 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,23 +1,26 @@
 class MessageController < ApplicationController
   layout 'site'
 class MessageController < ApplicationController
   layout 'site'

-  #  before_filter :authorize
+

   before_filter :authorize_web
   before_filter :require_user
 
   def new
   before_filter :authorize_web
   before_filter :require_user
 
   def new

+    @title = 'send message'

     if params[:message]
     if params[:message]

-      to_user = User.find_by_display_name(params[:display_name])
+      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 = to_user.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_display_name = to_user.display_name
       message.from_user_id = @user.id
       message.sent_on = Time.now

+   

       if message.save
         flash[:notice] = 'Message sent'
       if message.save
         flash[:notice] = 'Message sent'

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

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


@@ -26,20 +29,29 @@ class MessageController < ApplicationController
   end
 
   def read
   end
 
   def read

+    @title = 'read message'

     if params[:message_id]
       id = params[:message_id]
       @message = Message.find_by_id(id)
     end
   end
 
     if params[:message_id]
       id = params[:message_id]
       @message = Message.find_by_id(id)
     end
   end
 

+  def inbox
+    @title = 'inbox'
+    if @user and params[:display_name] == @user.display_name
+    else
+      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+    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
   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
+        flash[:notice] = 'Message marked as read'
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name

       end
     end
   end
       end
     end
   end