From 4a5d4b3c0b975b1fc08f22f347e18153de362218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Tue, 8 Sep 2020 16:28:39 +0200
Subject: [PATCH] Group investment search form methods together

We had helper methods all over the place which were only used in one
view. Since we're going to change some of them to use the budget as a
parameter, they don't belong in those helpers anymore.

Note the method `budget_heading_select_options` is used in more places,
so we're keeping it where it was.
---
 .../admin_budget_investments_helper.rb        | 21 +++++++++++++++++++
 app/helpers/admin_helper.rb                   |  4 ----
 app/helpers/budgets_helper.rb                 |  4 ----
 app/helpers/valuation_helper.rb               | 13 ------------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/helpers/admin_budget_investments_helper.rb b/app/helpers/admin_budget_investments_helper.rb
index e58a709f2..08c600243 100644
--- a/app/helpers/admin_budget_investments_helper.rb
+++ b/app/helpers/admin_budget_investments_helper.rb
@@ -12,4 +12,25 @@ module AdminBudgetInvestmentsHelper
   def init_advanced_menu
     params[:advanced_filters] = [] unless params[:advanced_filters]
   end
+
+  def admin_select_options
+    Administrator.with_user.map { |v| [v.description_or_name, v.id] }.sort_by { |a| a[0] }
+  end
+
+  def valuator_or_group_select_options
+    valuator_group_select_options + valuator_select_options
+  end
+
+  def valuator_select_options
+    Valuator.order("description ASC").order("users.email ASC").includes(:user).
+      map { |v| [v.description_or_email, "valuator_#{v.id}"] }
+  end
+
+  def valuator_group_select_options
+    ValuatorGroup.order("name ASC").map { |g| [g.name, "group_#{g.id}"] }
+  end
+
+  def investment_tags_select_options(budget, context)
+    budget.investments.tags_on(context).order(:name).pluck(:name)
+  end
 end
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 5731035c3..119bbe125 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -84,10 +84,6 @@ module AdminHelper
     options
   end
 
-  def admin_select_options
-    Administrator.with_user.map { |v| [v.description_or_name, v.id] }.sort_by { |a| a[0] }
-  end
-
   def admin_submit_action(resource)
     resource.persisted? ? "edit" : "new"
   end
diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index 122327830..d56d6de61 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -59,10 +59,6 @@ module BudgetsHelper
     Budget::Ballot.find_by(user: current_user, budget: @budget)
   end
 
-  def investment_tags_select_options(budget, context)
-    budget.investments.tags_on(context).order(:name).pluck(:name)
-  end
-
   def unfeasible_or_unselected_filter
     ["unselected", "unfeasible"].include?(@current_filter)
   end
diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb
index 9dab279ef..41217fdf5 100644
--- a/app/helpers/valuation_helper.rb
+++ b/app/helpers/valuation_helper.rb
@@ -1,17 +1,4 @@
 module ValuationHelper
-  def valuator_or_group_select_options
-    valuator_group_select_options + valuator_select_options
-  end
-
-  def valuator_select_options
-    Valuator.order("description ASC").order("users.email ASC").includes(:user).
-             map { |v| [v.description_or_email, "valuator_#{v.id}"] }
-  end
-
-  def valuator_group_select_options
-    ValuatorGroup.order("name ASC").map { |g| [g.name, "group_#{g.id}"] }
-  end
-
   def explanation_field(field)
     simple_format_no_tags_no_sanitize(sanitize_and_auto_link(field)) if field.present?
   end