diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-15 11:27:37 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-07 13:01:59 +0100 |
| commit | cfd475a45ee2655fa0148b0b561f95b44fe8641b (patch) | |
| tree | 84bc8f20239d58ed19e35cb515c50d3b36735c4f /app/controllers/dashboard | |
| parent | d1b60cbc67dc14b21820ef3f823a8e1ea851697d (diff) | |
| download | gitlab-ce-cfd475a45ee2655fa0148b0b561f95b44fe8641b.tar.gz | |
Removes default scope from sortable23079-remove-default-scope-in-sortable
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/groups_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb index 742157d113d..8057a0b455c 100644 --- a/app/controllers/dashboard/groups_controller.rb +++ b/app/controllers/dashboard/groups_controller.rb @@ -1,5 +1,7 @@ class Dashboard::GroupsController < Dashboard::ApplicationController def index + @sort = params[:sort] || 'id_desc' + @groups = if params[:parent_id] && Group.supports_nested_groups? parent = Group.find_by(id: params[:parent_id]) @@ -15,7 +17,7 @@ class Dashboard::GroupsController < Dashboard::ApplicationController @groups = @groups.search(params[:filter_groups]) if params[:filter_groups].present? @groups = @groups.includes(:route) - @groups = @groups.sort(@sort = params[:sort]) + @groups = @groups.sort(@sort) @groups = @groups.page(params[:page]) respond_to do |format| |