Use resourceful destroy method for messages

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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 6af860671d1190bdec8c06e6996b4c84bc21b6a9..cf3995b2b9a066b17d1680d32d85cb979c078e61 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -26,13 +26,14 @@ class MessagesController < ApplicationController
 
     if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
       flash[:error] = t ".limit_exceeded"
+      render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
       Notifier.message_notification(@message).deliver_now
       redirect_to :action => :inbox
-      return
+    else
+      render :action => "new"
     end
-    render :action => "new"
   end
 
   # Allow the user to reply to another message.
@@ -109,7 +110,7 @@ class MessagesController < ApplicationController
 
   # Destroy the message.
   def destroy
-    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
+    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:id])
     @message.from_user_visible = false if @message.sender == current_user
     @message.to_user_visible = false if @message.recipient == current_user
     if @message.save && !request.xhr?