From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jul 2012 19:14:23 +0000 (+0000)
Subject: Use named routes.
X-Git-Tag: 2.1.0~316
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=471f631dbdaa7f939f1023785708af146324701e;p=redmine.git

Use named routes.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10003 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index cb65df920..cc53c0d78 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -59,7 +59,7 @@ class MessagesController < ApplicationController
       if @message.save
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
-        redirect_to :action => 'show', :id => @message
+        redirect_to board_message_path(@board, @message)
       end
     end
   end
@@ -76,7 +76,7 @@ class MessagesController < ApplicationController
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)
     end
-    redirect_to :action => 'show', :id => @topic, :r => @reply
+    redirect_to board_message_path(@board, @topic, :r => @reply)
   end
 
   # Edit a message
@@ -88,7 +88,7 @@ class MessagesController < ApplicationController
       render_attachment_warning_if_needed(@message)
       flash[:notice] = l(:notice_successful_update)
       @message.reload
-      redirect_to :action => 'show', :board_id => @message.board, :id => @message.root, :r => (@message.parent_id && @message.id)
+      redirect_to board_message_path(@message.board, @message.root, :r => (@message.parent_id && @message.id))
     end
   end
 
@@ -97,9 +97,11 @@ class MessagesController < ApplicationController
     (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 => r }
+    if @message.parent
+      redirect_to board_message_path(@board, @message.parent, :r => r)
+    else
+      redirect_to project_board_path(@project, @board)
+    end
   end
 
   def quote
diff --git a/config/routes.rb b/config/routes.rb
index 0ee3908b1..87e656475 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,7 +33,7 @@ RedmineApp::Application.routes.draw do
   match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
 
   match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post]
-  get 'boards/:board_id/topics/:id', :to => 'messages#show'
+  get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
   match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
   get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'