Unified UsersController#list and #index.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2991 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2009-10-29 18:48:19 +00:00
parent e64fb6a728
commit 92ec35e657
4 changed files with 16 additions and 23 deletions
+1 -6
View File
@@ -24,11 +24,6 @@ class UsersController < ApplicationController
include CustomFieldsHelper
def index
list
render :action => 'list' unless request.xhr?
end
def list
sort_init 'login', 'asc'
sort_update %w(login firstname lastname mail admin created_on last_login_on)
@@ -49,7 +44,7 @@ class UsersController < ApplicationController
:limit => @user_pages.items_per_page,
:offset => @user_pages.current.offset
render :action => "list", :layout => false if request.xhr?
render :layout => !request.xhr?
end
def show