diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-10-29 18:48:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-10-29 18:48:19 +0000 |
| commit | 92ec35e6570bffea85ba2669146b7c4fd63f109d (patch) | |
| tree | 3605d3f349d8eb4ac53ff3fe6406c078d9438710 /app | |
| parent | e64fb6a728743cafed0bfe7d092e484cf74e85ca (diff) | |
| download | redmine-92ec35e6570bffea85ba2669146b7c4fd63f109d.tar.gz redmine-92ec35e6570bffea85ba2669146b7c4fd63f109d.zip | |
Unified UsersController#list and #index.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2991 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/users_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/users/index.rhtml (renamed from app/views/users/list.rhtml) | 0 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 71ceb758f..05dc5bc59 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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 diff --git a/app/views/users/list.rhtml b/app/views/users/index.rhtml index 758f1767a..758f1767a 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/index.rhtml |