diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-05-27 22:53:20 +0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-05-31 16:35:57 +0300 |
commit | 30e61ed79c89de4c31a4d2057f710ad2b0704389 (patch) | |
tree | f4941eda8679c0e82bea0a4b0ee05f191d93696b /app | |
parent | f9bb9151b595fdc1afc1742bb51c816965908f53 (diff) |
Fix error 500 when sorting issues by milestone due date and filtering by labels
Diffstat (limited to 'app')
-rw-r--r-- | app/finders/issuable_finder.rb | 2 | ||||
-rw-r--r-- | app/models/concerns/issuable.rb | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 8ed3ccf1c02..7d8c56f4c22 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -271,7 +271,7 @@ class IssuableFinder if filter_by_no_label? items = items.without_label else - items = items.with_label(label_names) + items = items.with_label(label_names, params[:sort]) if projects items = items.where(labels: { project_id: projects }) end diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 91315b3459f..117d66131ae 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -126,13 +126,30 @@ module Issuable joins(join_clause).group(issuable_table[:id]).reorder("COUNT(notes.id) DESC") end - def with_label(title) + def with_label(title, sort = nil) if title.is_a?(Array) && title.size > 1 - joins(:labels).where(labels: { title: title }).group(arel_table[:id]).having("COUNT(DISTINCT labels.title) = #{title.size}") + joins(:labels).where(labels: { title: title }).group(*get_grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}") else joins(:labels).where(labels: { title: title }) end end + + # Includes table keys in group by clause when sorting + # preventing errors in postgres + # + # Returns an array of arel columns + + def get_grouping_columns(sort) + default_columns = [arel_table[:id]] + + if ["milestone_due_desc", "milestone_due_asc"].include?(sort) + milestone_table = Milestone.arel_table + default_columns << milestone_table[:id] + default_columns << milestone_table[:due_date] + end + + default_columns + end end def today? |