diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
| commit | 5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch) | |
| tree | 93e57765139714bd82dede475725516c448c0d55 /app/controllers/messages_controller.rb | |
| parent | 34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff) | |
| download | redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip | |
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/messages_controller.rb')
| -rw-r--r-- | app/controllers/messages_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index a8ef03f34..2a04641ad 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -95,10 +95,11 @@ class MessagesController < ApplicationController # Delete a messages def destroy (render_403; return false) unless @message.destroyable_by?(User.current) + r = @message.to_param @message.destroy redirect_to @message.parent.nil? ? { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } : - { :action => 'show', :id => @message.parent, :r => @message } + { :action => 'show', :id => @message.parent, :r => r } end def quote |