diff options
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/queries_helper.rb | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 9c403ab8f..6c8ba1a7f 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -24,28 +24,7 @@ module QueriesHelper def filters_options(query) options = [[]] - sorted_options = query.available_filters.sort do |a, b| - ord = 0 - if !(a[1][:order] == 20 && b[1][:order] == 20) - ord = a[1][:order] <=> b[1][:order] - else - cn = (CustomField::CUSTOM_FIELDS_NAMES.index(a[1][:field].class.name) <=> - CustomField::CUSTOM_FIELDS_NAMES.index(b[1][:field].class.name)) - if cn != 0 - ord = cn - else - f = (a[1][:field] <=> b[1][:field]) - if f != 0 - ord = f - else - # assigned_to or author - ord = (a[0] <=> b[0]) - end - end - end - ord - end - options += sorted_options.map do |field, field_options| + options += query.available_filters.map do |field, field_options| [field_options[:name], field] end end |