Return "404 Not Found" for users and traces which don't exist.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 0fc5f212bdf3705dea3edaf98ddc285ea2d2bfd6..26102cc639faa8ef547566e8ce754b741e600fb1 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,6 +1,6 @@
 class MessageController < ApplicationController
   layout 'site'
 class MessageController < ApplicationController
   layout 'site'

-  #  before_filter :authorize
+

   before_filter :authorize_web
   before_filter :require_user
 
   before_filter :authorize_web
   before_filter :require_user
 


@@ -14,13 +14,12 @@ class MessageController < ApplicationController
       message.body = body
       message.title = title
       message.to_user_id = params[:user_id]
       message.body = body
       message.title = title
       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
    
       if message.save
         flash[:notice] = 'Message sent'
       message.from_user_id = @user.id
       message.sent_on = Time.now
    
       if message.save
         flash[:notice] = 'Message sent'

-        redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+        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


@@ -37,6 +36,11 @@ class MessageController < ApplicationController
   end
 
   def inbox
   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
   end
 
   def mark


@@ -45,8 +49,8 @@ class MessageController < ApplicationController
       message = Message.find_by_id(id)
       message.message_read = 1
       if message.save
       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