Refactor: Merged RolesController#list and #index

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3435 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/351/head
Eric Davis 15 years ago
parent cec2b20793
commit 038a88e970
  1. 9
      app/controllers/roles_controller.rb
  2. 0
      app/views/roles/index.html.erb
  3. 2
      test/functional/roles_controller_test.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

@ -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)

Loading…
Cancel
Save