diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-02-15 16:41:16 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-02-15 16:41:16 +0000 |
| commit | 038a88e970aa7d0512258a903614b99e5f7e98ae (patch) | |
| tree | 797d592057d03f77fe17a656904ea08e22dacfb1 | |
| parent | cec2b20793704babbc8bae3f4b15e71f5c9a6ef0 (diff) | |
| download | redmine-038a88e970aa7d0512258a903614b99e5f7e98ae.tar.gz redmine-038a88e970aa7d0512258a903614b99e5f7e98ae.zip | |
Refactor: Merged RolesController#list and #index
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3435 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/roles_controller.rb | 9 | ||||
| -rw-r--r-- | app/views/roles/index.html.erb (renamed from app/views/roles/list.rhtml) | 0 | ||||
| -rw-r--r-- | test/functional/roles_controller_test.rb | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index c701cac74..00902735c 100644 --- 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/list.rhtml b/app/views/roles/index.html.erb index 41878146b..41878146b 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/index.html.erb diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb index 200408837..9159742c9 100644 --- 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) |