Commit 038a88e9 authored by Eric Davis's avatar Eric Davis

Refactor: Merged RolesController#list and #index

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3435 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent cec2b207
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment