summaryrefslogtreecommitdiffstats
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb7
1 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