kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: Merged RolesController#list and #index 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3435 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-02-15 16:41:16 +00:00
parent cec2b20793
commit 038a88e970
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/roles_controller.rb
View File

@ -21,16 +21,11 @@ class RolesController < ApplicationController
before_filter :require_admin before_filter :require_admin
verify :method => :post, :only => [ :destroy, :move ], verify :method => :post, :only => [ :destroy, :move ],
:redirect_to => { :action => :list } :redirect_to => { :action => :index }
def index def index
list
render :action => 'list' unless request.xhr?
end
def list
@role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position' @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 end
def new def new

0
app/views/roles/list.rhtml → app/views/roles/index.html.erb
View File

2
test/functional/roles_controller_test.rb
View File

@ -35,7 +35,7 @@ class RolesControllerTest < ActionController::TestCase
def test_get_index def test_get_index
get :index get :index
assert_response :success assert_response :success
assert_template 'list' assert_template 'index'
assert_not_nil assigns(:roles) assert_not_nil assigns(:roles)
assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles) assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)