diff --git a/app/helpers/budget_investments_helper.rb b/app/helpers/budget_investments_helper.rb index e98bd2b70..e26b4099b 100644 --- a/app/helpers/budget_investments_helper.rb +++ b/app/helpers/budget_investments_helper.rb @@ -6,8 +6,9 @@ module BudgetInvestmentsHelper def link_to_investments_sorted_by(column) sort_by = column.downcase default_direction = "desc" + current_direction = params[:direction].downcase if params[:direction] - direction = params[:direction] == default_direction ? default_direction : "asc" + direction = current_direction == default_direction ? default_direction : "asc" icon = direction == default_direction ? "icon-arrow-down" : "icon-arrow-top" icon = sort_by == params[:sort_by] ? icon : "" diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 607c6cb95..4017fc2ce 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -140,7 +140,7 @@ class Budget end def self.order_filter(params) - sorting_key = params[:sort_by].to_sym if params[:sort_by] + sorting_key = params[:sort_by].downcase.to_sym if params[:sort_by] allowed_sort_option = SORTING_OPTIONS.select { |so| so[sorting_key]}.reduce if allowed_sort_option.present?