Revert last commit - too many test failures

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index f3f3bf9ea13404e177e23a605a2ba42a32928bd4..c039fe636e643c1aed4ab1f24cea7fd4978e5e16 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -7,11 +7,13 @@ class MessageController < ApplicationController
   # 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.
   # 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.

+  # The user_id param is the id of the user that the message is being sent to.

   def new
     @title = 'send message'
   def new
     @title = 'send message'

+    @to_user = User.find(params[:user_id])

     if params[:message]
       @message = Message.new(params[:message])
     if params[:message]
       @message = Message.new(params[:message])

-      @message.to_user_id = params[:user_id]
+      @message.to_user_id = @to_user.id

       @message.from_user_id = @user.id
       @message.sent_on = Time.now
    
       @message.from_user_id = @user.id
       @message.sent_on = Time.now
    


@@ -23,6 +25,8 @@ class MessageController < ApplicationController
     else
       @title = params[:title]
     end
     else
       @title = params[:title]
     end

+  rescue ActiveRecord::RecordNotFound
+    render :action => 'no_such_user', :status => :not_found

   end
 
   # Allow the user to reply to another message.
   end
 
   # Allow the user to reply to another message.


@@ -31,19 +35,20 @@ class MessageController < ApplicationController
     @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
     @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

+    @to_user = User.find(message.to_user_id)

     render :action => 'new'
   rescue ActiveRecord::RecordNotFound
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound

-    render :nothing => true, :status => :not_found
+    render :action => 'no_such_user', :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 ])
   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 ])

-    @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
     @message.save
   rescue ActiveRecord::RecordNotFound

-    render :nothing => true, :status => :not_found
+    render :action => 'no_such_user', :status => :not_found

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


@@ -70,10 +75,10 @@ class MessageController < ApplicationController
       id = params[:message_id]
       message = Message.find_by_id(id)
       if params[:mark] == 'unread'
       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


@@ -82,5 +87,7 @@ class MessageController < ApplicationController
         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

+  rescue ActiveRecord::RecordNotFound
+    render :action => 'no_such_user', :status => :not_found

   end
 end
   end
 end