diff --git a/app/helpers/budget_investments_helper.rb b/app/helpers/budget_investments_helper.rb index 75255e7a8..e98bd2b70 100644 --- a/app/helpers/budget_investments_helper.rb +++ b/app/helpers/budget_investments_helper.rb @@ -5,18 +5,11 @@ module BudgetInvestmentsHelper def link_to_investments_sorted_by(column) sort_by = column.downcase - allowed_directions = %w[asc desc].freeze default_direction = "desc" - current_direction = params[:direction] - if allowed_directions.include?(current_direction) - #select opposite direction - direction = allowed_directions.reject { |dir| dir == current_direction }.first - else - direction = default_direction - end + direction = params[:direction] == default_direction ? default_direction : "asc" - icon = direction == default_direction ? "icon-arrow-top" : "icon-arrow-down" + icon = direction == default_direction ? "icon-arrow-down" : "icon-arrow-top" icon = sort_by == params[:sort_by] ? icon : "" translation = t("admin.budget_investments.index.sort_by.#{sort_by}") diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index e10070592..607c6cb95 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -144,7 +144,7 @@ class Budget allowed_sort_option = SORTING_OPTIONS.select { |so| so[sorting_key]}.reduce if allowed_sort_option.present? - direction = %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc" + direction = params[:direction] == "desc" ? "desc" : "asc" return order("#{allowed_sort_option[sorting_key]} #{direction}") end order(cached_votes_up: :desc).order(id: :desc)