diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-20 02:06:30 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-20 02:06:30 +0300 |
commit | c620c4057593a726044f9dc1a907149831a54c28 (patch) | |
tree | 8f030f5d009649d174438c2db090d74ab53a6850 /app/finders | |
parent | d6e027d9ca4aef4f2aaca8b3dc75e337d83c85dd (diff) | |
parent | 37bf35f0bcba28e271789542fb8c81a6c77236b6 (diff) |
Merge branch 'issue_18135' into 'master'
Todos sorting dropdown
Implements #18135
![todos_sorting](/uploads/bff76827c421628134dfb8b864e47c74/todos_sorting.png)
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5691
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/todos_finder.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb index 37bad596a16..06b3e8a9502 100644 --- a/app/finders/todos_finder.rb +++ b/app/finders/todos_finder.rb @@ -33,7 +33,7 @@ class TodosFinder # the project IDs yielded by the todos query thus far items = by_project(items) - items.reorder(id: :desc) + sort(items) end private @@ -106,6 +106,10 @@ class TodosFinder params[:type] end + def sort(items) + params[:sort] ? items.sort(params[:sort]) : items.reorder(id: :desc) + end + def by_action(items) if action? items = items.where(action: to_action_id) |