summaryrefslogtreecommitdiff
path: root/app/controllers/admin/groups_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-05 19:15:05 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-05 19:15:05 -0800
commitbbca6a0abd9f5559fe4abbf2cb2100a0e4717ac8 (patch)
tree34b5f2fd0c2301b8d5284700bec64ee272246bc4 /app/controllers/admin/groups_controller.rb
parente0aa5c371ea1c633a0648f13cd7bea35f3aea75c (diff)
downloadgitlab-ce-bbca6a0abd9f5559fe4abbf2cb2100a0e4717ac8.tar.gz
Refactor sorting in project
Diffstat (limited to 'app/controllers/admin/groups_controller.rb')
-rw-r--r--app/controllers/admin/groups_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index ae610d4871c..65dc027c8eb 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -2,7 +2,8 @@ class Admin::GroupsController < Admin::ApplicationController
before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update]
def index
- @groups = Group.order_name
+ @groups = Group.all
+ @groups = @groups.sort(@sort = params[:sort])
@groups = @groups.search(params[:name]) if params[:name].present?
@groups = @groups.page(params[:page]).per(20)
end