Ensure :not_found status is returned, catching RecordNotFound doesn't work as isnt...

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index a04aa82c0c7959e0b504d2a7f0da211a1fde99b7..2f71107f4b39e35720b78193d549a6f716d74e83 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -3,6 +3,8 @@ class MessageController < ApplicationController
 
   before_filter :authorize_web
   before_filter :require_user
 
   before_filter :authorize_web
   before_filter :require_user

+  before_filter :check_database_readable
+  before_filter :check_database_writable, :only => [:new, :reply, :mark]

 
   # 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
 
   # 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


@@ -34,8 +36,7 @@ class MessageController < ApplicationController
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
     @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
     @title = "Re: #{message.title.sub(/^Re:\s*/, '')}"
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @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)
+    @to_user = User.find(message.from_user_id)

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