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 22d23a8ba5deb0c31f4ff13b87bf21606ef4f27c..296737dd52f42bb0d7f86a8efb8638b6a2a20009 100644 (file)
--- 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 d3a3cf13a94e5de3eeb0db723718de2f51325a01..cf4e34321c5dc2b18bcfd7d21884a19f42ecce30 100644 (file)
--- 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',