X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/07f130f0a68f5eb806338d379031a49866966cd6..3c79240a6ab23e4103826dd1cec7a12a19e948db:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index a95ad25b6..9b678e274 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,10 +1,11 @@
 class MessageController < ApplicationController
   layout 'site'
-  #  before_filter :authorize
+
   before_filter :authorize_web
   before_filter :require_user
 
   def new
+    @title = 'send message'
     if params[:message]
       to_user = User.find(params[:user_id])
       body = params[:message][:body]
@@ -13,12 +14,12 @@ class MessageController < ApplicationController
       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'
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       else
         @message.errors.add("Sending message failed")
       end
@@ -27,9 +28,20 @@ class MessageController < ApplicationController
   end
 
   def read
+    @title = 'read message'
     if params[:message_id]
       id = params[:message_id]
       @message = Message.find_by_id(id)
+      @message.message_read = 1
+      @message.save
+    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
 
@@ -37,10 +49,17 @@ class MessageController < ApplicationController
     if params[:message_id]
       id = params[:message_id]
       message = Message.find_by_id(id)
-      message.message_read = 1
+      if params[:mark] == 'unread'
+        message_read = 0 
+        mark_type = 'unread'
+      else
+        message_read = 1
+        mark_type = 'read'
+      end
+      message.message_read = message_read
       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 #{mark_type}"
+        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
     end
   end