Removed EnumerationsController#list action.

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

diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
index 73d39dd4db1c3593b51afc948fff410459defd4f..c567b6ae68a940cc90b560cfce294f1ec724fda7 100644 (file)
--- a/app/controllers/enumerations_controller.rb
+++ b/app/controllers/enumerations_controller.rb
@@ -24,16 +24,10 @@ class EnumerationsController < ApplicationController
   include CustomFieldsHelper
 
   def index
-    list
-    render :action => 'list'
   end
 
-  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
   verify :method => :post, :only => [ :destroy, :create, :update ],
-         :redirect_to => { :action => :list }
-
-  def list
-  end
+         :redirect_to => { :action => :index }
 
   def new
     begin
@@ -48,7 +42,7 @@ class EnumerationsController < ApplicationController
     @enumeration.type = params[:enumeration][:type]
     if @enumeration.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'list', :type => @enumeration.type
+      redirect_to :action => 'index', :type => @enumeration.type
     else
       render :action => 'new'
     end
@@ -63,7 +57,7 @@ class EnumerationsController < ApplicationController
     @enumeration.type = params[:enumeration][:type] if params[:enumeration][:type]
     if @enumeration.update_attributes(params[:enumeration])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list', :type => @enumeration.type
+      redirect_to :action => 'index', :type => @enumeration.type
     else
       render :action => 'edit'
     end

diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb
new file mode 100644 (file)
index 0000000..80f7ef3
--- /dev/null
+++ b/app/views/enumerations/index.html.erb
@@ -0,0 +1,37 @@
+<h2><%=l(:label_enumerations)%></h2>
+
+<% Enumeration.get_subclasses.each do |klass| %>
+<h3><%= l(klass::OptionName) %></h3>
+
+<% enumerations = klass.shared %>
+<% if enumerations.any? %>
+<table class="list"><thead>
+<tr>
+    <th><%= l(:field_name) %></th>
+    <th style="width:15%;"><%= l(:field_is_default) %></th>
+    <th style="width:15%;"><%= l(:field_active) %></th>
+    <th style="width:15%;"></th>
+    <th align="center" style="width:10%;"> </th>
+</tr></thead>
+<% enumerations.each do |enumeration| %>
+<tr class="<%= cycle('odd', 'even') %>">
+    <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
+    <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
+    <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
+    <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
+    <td class="buttons">
+    <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
+                                   :method => :post,
+                                   :confirm => l(:text_are_you_sure),
+                                   :class => 'icon icon-del' %>
+    </td>
+</tr>
+<% end %>
+</table>
+<% reset_cycle %>
+<% end %>
+
+<p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
+<% end %>
+
+<% html_title(l(:label_enumerations)) -%>

diff --git a/app/views/enumerations/list.html.erb b/app/views/enumerations/list.html.erb
deleted file mode 100644 (file)
index 80f7ef3..0000000
--- a/app/views/enumerations/list.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<h2><%=l(:label_enumerations)%></h2>
-
-<% Enumeration.get_subclasses.each do |klass| %>
-<h3><%= l(klass::OptionName) %></h3>
-
-<% enumerations = klass.shared %>
-<% if enumerations.any? %>
-<table class="list"><thead>
-<tr>
-    <th><%= l(:field_name) %></th>
-    <th style="width:15%;"><%= l(:field_is_default) %></th>
-    <th style="width:15%;"><%= l(:field_active) %></th>
-    <th style="width:15%;"></th>
-    <th align="center" style="width:10%;"> </th>
-</tr></thead>
-<% enumerations.each do |enumeration| %>
-<tr class="<%= cycle('odd', 'even') %>">
-    <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
-    <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
-    <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
-    <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
-    <td class="buttons">
-    <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
-                                   :method => :post,
-                                   :confirm => l(:text_are_you_sure),
-                                   :class => 'icon icon-del' %>
-    </td>
-</tr>
-<% end %>
-</table>
-<% reset_cycle %>
-<% end %>
-
-<p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
-<% end %>
-
-<% html_title(l(:label_enumerations)) -%>

diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb
index 3ab40b5cf35449eadf2d325a68325bbaaf1426fe..d306ef9265e95105f27394839baf091bc71c8f3c 100644 (file)
--- a/test/functional/enumerations_controller_test.rb
+++ b/test/functional/enumerations_controller_test.rb
@@ -34,7 +34,7 @@ class EnumerationsControllerTest < ActionController::TestCase
   def test_index
     get :index
     assert_response :success
-    assert_template 'list'
+    assert_template 'index'
   end
 
   def test_destroy_enumeration_not_in_use