Fix spelling mistake.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 0fec8aab1cb00225d67ef62df671fe44e52f1f69..d6e5d7fdadc4b86c326bc06217530fc76a169f48 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 :check_database_readable
+  before_filter :check_database_writable, :only => [:new, :reply, :mark]
 
   def new
     @title = 'send message'
@@ -17,18 +19,8 @@ class MessageController < ApplicationController
         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
-      flash[:notice] = "Message '#{@message.title}' deleted"
-      @message.destroy
-      redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+      @title = params[:title]
     end
   end