From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 9 Jan 2012 00:08:50 +0000 (+0000)
Subject: route: use ":controller" instead of ":as" for project_enumerations
X-Git-Tag: 1.4.0~720
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5835648290e91b3f7646d4750e5eb6f3cd0b222f;p=redmine.git

route: use ":controller" instead of ":as" for project_enumerations

Rails3 new route format needs this syntax.

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

diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb
index 22d23a8ba..296737dd5 100644
--- a/app/views/projects/settings/_activities.html.erb
+++ b/app/views/projects/settings/_activities.html.erb
@@ -1,4 +1,4 @@
-<% form_tag(project_project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
+<% form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
 
 <table class="list">
   <thead><tr>
@@ -32,7 +32,7 @@
 </table>
 
 <div class="contextual">
-<%= link_to(l(:button_reset), project_project_enumerations_path(@project),
+<%= link_to(l(:button_reset), project_enumerations_path(@project),
             :method => :delete,
             :confirm => l(:text_are_you_sure),
             :class => 'icon icon-del') %>
diff --git a/config/routes.rb b/config/routes.rb
index d3a3cf13a..cf4e34321 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -151,7 +151,7 @@ ActionController::Routing::Routes.draw do |map|
     :archive => :post,
     :unarchive => :post
   } do |project|
-    project.resource :project_enumerations, :as => 'enumerations',
+    project.resource :enumerations, :controller => 'project_enumerations',
                      :only => [:update, :destroy]
     # issue form update
     project.issue_form 'issues/new', :controller => 'issues',