Refactor: Merged RolesController#list and #index

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

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index c701cac7458ae0718791799d75123897ba48b66c..00902735cd5657730358be6b7f9314ce77a4df42 100644 (file)
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -21,16 +21,11 @@ class RolesController < ApplicationController
   before_filter :require_admin
 
   verify :method => :post, :only => [ :destroy, :move ],
-         :redirect_to => { :action => :list }
+         :redirect_to => { :action => :index }
 
   def index
-    list
-    render :action => 'list' unless request.xhr?
-  end
-
-  def list
     @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
-    render :action => "list", :layout => false if request.xhr?
+    render :action => "index", :layout => false if request.xhr?
   end
 
   def new

diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
new file mode 100644 (file)
index 0000000..4187814
--- /dev/null
+++ b/app/views/roles/index.html.erb
@@ -0,0 +1,37 @@
+<div class="contextual">
+<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_role_plural)%></h2>
+
+<table class="list">
+  <thead><tr>
+    <th><%=l(:label_role)%></th>
+    <th><%=l(:button_sort)%></th>
+       <th></th>
+  </tr></thead>
+  <tbody>
+<% for role in @roles %>
+  <tr class="<%= cycle("odd", "even") %>">
+  <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, :action => 'edit', :id => role)) %></td>
+  <td align="center" style="width:15%;">
+  <% unless role.builtin? %>
+    <%= reorder_links('role', {:action => 'edit', :id => role}) %>
+  <% end %>
+  </td>
+  <td class="buttons">
+    <%= link_to(l(:button_delete), { :action => 'destroy', :id => role },
+                                                                                                                       :method => :post, 
+                                                                                                                       :confirm => l(:text_are_you_sure),
+                                                                                                                       :class => 'icon icon-del') unless role.builtin? %>
+  </td>
+  </tr>
+<% end %>
+  </tbody>
+</table>
+
+<p class="pagination"><%= pagination_links_full @role_pages %></p>
+
+<p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
+
+<% html_title(l(:label_role_plural)) -%>

diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
deleted file mode 100644 (file)
index 4187814..0000000
--- a/app/views/roles/list.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="contextual">
-<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_role_plural)%></h2>
-
-<table class="list">
-  <thead><tr>
-    <th><%=l(:label_role)%></th>
-    <th><%=l(:button_sort)%></th>
-       <th></th>
-  </tr></thead>
-  <tbody>
-<% for role in @roles %>
-  <tr class="<%= cycle("odd", "even") %>">
-  <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, :action => 'edit', :id => role)) %></td>
-  <td align="center" style="width:15%;">
-  <% unless role.builtin? %>
-    <%= reorder_links('role', {:action => 'edit', :id => role}) %>
-  <% end %>
-  </td>
-  <td class="buttons">
-    <%= link_to(l(:button_delete), { :action => 'destroy', :id => role },
-                                                                                                                       :method => :post, 
-                                                                                                                       :confirm => l(:text_are_you_sure),
-                                                                                                                       :class => 'icon icon-del') unless role.builtin? %>
-  </td>
-  </tr>
-<% end %>
-  </tbody>
-</table>
-
-<p class="pagination"><%= pagination_links_full @role_pages %></p>
-
-<p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
-
-<% html_title(l(:label_role_plural)) -%>

diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index 20040883781ff486dc03a14c6005e5e35f8129bb..9159742c955bda108a59484ccaea5d930c0501a9 100644 (file)
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -35,7 +35,7 @@ class RolesControllerTest < ActionController::TestCase
   def test_get_index
     get :index
     assert_response :success
-    assert_template 'list'
+    assert_template 'index'
 
     assert_not_nil assigns(:roles)
     assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)