From 35cebe0eefcb1727981ad8411c6b65574ac84a98 Mon Sep 17 00:00:00 2001 From: Anna Anks Nowak Date: Tue, 1 Jan 2019 18:19:06 +0100 Subject: [PATCH] Use symbols in sorting and set direction properly --- app/models/budget/investment.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index fa2756ba5..8bb47d507 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -140,10 +140,11 @@ class Budget end def self.order_filter(sorting_param, direction) - sorting_key = sorting_param.to_sym + sorting_key = sorting_param.to_sym if sorting_param available_option = SORTING_OPTIONS.select { |sp| sp[sorting_key]}.reduce + if sorting_param.present? && available_option.present? then - %w[asc desc].include?(direction) ? direction : "desc" + direction = %w[asc desc].include?(direction) ? direction : "asc" order("#{available_option[sorting_key]} #{direction}") else order(cached_votes_up: :desc).order(id: :desc)