Showing all messages in inbox, but sorting by date DESC and highlighting new ones...

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index a95ad25b60e4eb1c9638fbbe23ca7494ee72d7ee..9b678e274aa06b526471811cd56c7a5d39847c2e 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,10 +1,11 @@
 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]
       to_user = User.find(params[:user_id])
       body = params[:message][:body]
     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.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 => 'message', :action => 'inbox', :display_name => @user.display_name

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


@@ -27,9 +28,20 @@ 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)
     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
 
     end
   end
 


@@ -37,10 +49,17 @@ class MessageController < ApplicationController
     if params[:message_id]
       id = params[:message_id]
       message = Message.find_by_id(id)
     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
       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
       end
     end
   end