Allow the map centre and marker position to be set independently.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 0fc5f212bdf3705dea3edaf98ddc285ea2d2bfd6..a712931c554f8343a74d1e17e8d281100c126501 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,6 +1,6 @@
 class MessageController < ApplicationController
   layout 'site'
-  #  before_filter :authorize
+
   before_filter :authorize_web
   before_filter :require_user
 
@@ -20,7 +20,7 @@ class MessageController < ApplicationController
    
       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
@@ -37,6 +37,11 @@ class MessageController < ApplicationController
   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
@@ -45,8 +50,8 @@ class MessageController < ApplicationController
       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