Migration to add close-time to changesets. This replaces the boolean 'open' attribute...

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 8aecef98e56a87059595550c72064170fca66501..fc7a9101b12496084b96c054db873013874dbea3 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -4,6 +4,9 @@ class MessageController < ApplicationController
   before_filter :authorize_web
   before_filter :require_user
 
   before_filter :authorize_web
   before_filter :require_user
 

+  # Allow the user to write a new message to another user. This action also 
+  # deals with the sending of that message to the other user when the user
+  # clicks send.

   def new
     @title = 'send message'
     if params[:message]
   def new
     @title = 'send message'
     if params[:message]


@@ -17,40 +20,33 @@ class MessageController < ApplicationController
         Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end
         Notifier::deliver_message_notification(@message)
         redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
       end

-    end
-  end
-
-  def destroy
-    @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
-    if !@message.message_read
-      flash[:notice] = 'Message not read and so not deleted'
-      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name

     else
     else

-      flash[:notice] = "Message '#{@message.title}' deleted"
-      @message.destroy
-      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+      @title = params[:title]

     end
   end
 
     end
   end
 

+  # Allow the user to reply to another message.

   def reply
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
   def reply
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])

-    @body = "\n\nOn #{message.sent_on} #{message.sender.display_name} wrote:\n #{message.body}" 
-    @title = "Re: #{message.title}"
+    @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
+    @title = "Re: #{message.title.sub(/^Re:\s*/, '')}"

     @user_id = message.from_user_id
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
   end
 
     @user_id = message.from_user_id
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
   end
 

+  # Show a message

   def read
     @title = 'read message'
     @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
   def read
     @title = 'read message'
     @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])

-    @message.message_read = 1 if @message.to_user_id == @user.id
+    @message.message_read = true if @message.to_user_id == @user.id

     @message.save
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
   end
 
     @message.save
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
   end
 

+  # Display the list of messages that have been sent to the user.

   def inbox
     @title = 'inbox'
     if @user and params[:display_name] == @user.display_name
   def inbox
     @title = 'inbox'
     if @user and params[:display_name] == @user.display_name


@@ -59,6 +55,7 @@ class MessageController < ApplicationController
     end
   end
 
     end
   end
 

+  # Display the list of messages that the user has sent to other users.

   def outbox
     @title = 'outbox'
     if @user and params[:display_name] == @user.display_name
   def outbox
     @title = 'outbox'
     if @user and params[:display_name] == @user.display_name


@@ -67,15 +64,16 @@ class MessageController < ApplicationController
     end
   end
 
     end
   end
 

+  # Set the message as being read or unread.

   def mark
     if params[:message_id]
       id = params[:message_id]
       message = Message.find_by_id(id)
       if params[:mark] == 'unread'
   def mark
     if params[:message_id]
       id = params[:message_id]
       message = Message.find_by_id(id)
       if params[:mark] == 'unread'

-        message_read = 0 
+        message_read = false 

         mark_type = 'unread'
       else
         mark_type = 'unread'
       else

-        message_read = 1
+        message_read = true

         mark_type = 'read'
       end
       message.message_read = message_read
         mark_type = 'read'
       end
       message.message_read = message_read