From 7b89dd6a5f663448ea0c06b2ebd38e334ccb9818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Thu, 31 Oct 2019 15:31:19 +0100
Subject: [PATCH] Refactor links to show staff members

---
 .../javascripts/budget_edit_associations.js   |  4 +++-
 app/views/admin/budgets/_form.html.erb        | 20 ++++++++-----------
 config/i18n-tasks.yml                         |  1 +
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/budget_edit_associations.js b/app/assets/javascripts/budget_edit_associations.js
index a50485a24..213ce14ab 100644
--- a/app/assets/javascripts/budget_edit_associations.js
+++ b/app/assets/javascripts/budget_edit_associations.js
@@ -26,8 +26,10 @@
         }
       });
       $(".js-budget-show-users-list").on({
-        click: function() {
+        click: function(e) {
           var div_id;
+
+          e.preventDefault();
           div_id = $(this).data().toggle;
           $(".js-budget-users-list").each(function() {
             if (this.id !== div_id && !$(this).hasClass("is-hidden")) {
diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb
index 180cb15e0..484927d7a 100644
--- a/app/views/admin/budgets/_form.html.erb
+++ b/app/views/admin/budgets/_form.html.erb
@@ -24,18 +24,14 @@
   </div>
 
   <div class="margin-top">
-    <div class="small-12 medium-4 column end">
-      <a id="administrators_button" class="button expanded hollow js-budget-show-users-list js-budget-show-administrators-list" data-toggle="administrators_list"><%= t("admin.budgets.edit.administrators", count: @budget.administrators.count) %>
-      </a>
-    </div>
-    <div class="small-12 medium-4 column end">
-      <a id="valuators_button" class="button expanded hollow js-budget-show-users-list js-budget-show-valuators-list" data-toggle="valuators_list"><%= t("admin.budgets.edit.valuators", count: @budget.valuators.count) %>
-      </a>
-    </div>
-    <div class="small-12 medium-4 column end">
-      <a id="trackers_button" class="button expanded hollow js-budget-show-users-list js-budget-show-trackers-list" data-toggle="trackers_list"><%= t("admin.budgets.edit.trackers", count: @budget.trackers.count) %>
-      </a>
-    </div>
+    <% %w[administrators valuators trackers].each do |staff| %>
+      <div class="small-12 medium-4 column end">
+        <%= link_to t("admin.budgets.edit.#{staff}", count: @budget.send(staff).count),
+          "#",
+          class: "button expanded hollow js-budget-show-#{staff}-list js-budget-show-users-list",
+          data: { toggle: "#{staff}_list" } %>
+      </div>
+    <% end %>
   </div>
 
   <div class="margin-top">
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index a948511fd..99bfe965a 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -141,6 +141,7 @@ ignore_unused:
   - "admin.hidden_proposals.index.filter*"
   - "admin.proposal_notifications.index.filter*"
   - "admin.budgets.index.filter*"
+  - "admin.budgets.edit.(administrators|trackers|valuators).*"
   - "admin.budget_investments.index.filter*"
   - "admin.organizations.index.filter*"
   - "admin.hidden_users.index.filter*"