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 a712931c554f8343a74d1e17e8d281100c126501..9b678e274aa06b526471811cd56c7a5d39847c2e 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -14,7 +14,6 @@ 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
    
       message.from_user_id = @user.id
       message.sent_on = Time.now
    


@@ -33,6 +32,8 @@ 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
+      @message.save

     end
   end
 
     end
   end
 


@@ -48,9 +49,16 @@ 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'
+        flash[:notice] = "Message marked as #{mark_type}"

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