From e1fcaf66ef18c2aa7f69a0bd2a86fd08670e2e7c Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Mon, 5 Dec 2016 17:32:37 +0100
Subject: [PATCH] Moves ballot/_add and ballot/_remove inside _ballot

---
 app/views/budgets/ballot/_add.html.erb        | 16 ------
 app/views/budgets/ballot/_remove.html.erb     | 18 -------
 .../budgets/investments/_ballot.html.erb      | 52 +++++++++++++++----
 .../budgets/investments/_investment.html.erb  |  6 ++-
 4 files changed, 47 insertions(+), 45 deletions(-)
 delete mode 100644 app/views/budgets/ballot/_add.html.erb
 delete mode 100644 app/views/budgets/ballot/_remove.html.erb

diff --git a/app/views/budgets/ballot/_add.html.erb b/app/views/budgets/ballot/_add.html.erb
deleted file mode 100644
index 27c22ae2f..000000000
--- a/app/views/budgets/ballot/_add.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="add in-favor">
-  <p class="investment-project-amount">
-    <%= format_price(@budget, investment.price) %>
-  </p>
-
-  <% if @budget.balloting? %>
-    <%= link_to budget_ballot_lines_url(investment_id: investment.id,
-                                        investments_ids: @ballot.investment_ids),
-        class: "button button-support small expanded",
-        title: t('budget.investments.investment.support_title'),
-        method: "post",
-        remote: true do %>
-        <%= t("budget.investments.investment.add") %>
-    <% end %>
-  <% end %>
-</div>
diff --git a/app/views/budgets/ballot/_remove.html.erb b/app/views/budgets/ballot/_remove.html.erb
deleted file mode 100644
index e789b0ae6..000000000
--- a/app/views/budgets/ballot/_remove.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="remove supported inline-block">
-  <span class="icon-check-circle bounceIn animated"
-        title="<%= t("budget.investments.investment.already_added") %>">
-  </span>
-
-  <p class="investment-project-amount">
-    <%= format_price(@budget, investment.price) %>
-  </p>
-
-  <% if @budget.balloting? %>
-    <%= link_to t('budgets.ballots.show.remove'),
-                budget_ballot_line_path(id: investment.id,
-                                 investments_ids: investment_ids),
-                class: "delete small expanded",
-                method: :delete,
-                remote: true %>
-  <% end %>
-</div>
diff --git a/app/views/budgets/investments/_ballot.html.erb b/app/views/budgets/investments/_ballot.html.erb
index b4aa8af97..32a788756 100644
--- a/app/views/budgets/investments/_ballot.html.erb
+++ b/app/views/budgets/investments/_ballot.html.erb
@@ -1,16 +1,46 @@
-<% reason = investment.reason_for_not_being_ballotable_by(current_user, @ballot) %>
+<% reason = investment.reason_for_not_being_ballotable_by(current_user, investment_ballot) %>
 <div class="supports ballot">
-  <% if @ballot.has_investment?(investment) %>
-    <%= render 'budgets/ballot/remove',
-               investment: investment,
-               investment_ids: @investments %>
+  <% if investment_ballot.has_investment?(investment) %>
+
+    <div class="remove supported inline-block">
+      <span class="icon-check-circle bounceIn animated"
+            title="<%= t("budget.investments.investment.already_added") %>">
+      </span>
+      <p class="investment-project-amount">
+        <%= investment.formatted_price %>
+      </p>
+      <% if investment.should_show_ballots? %>
+        <%= link_to t('budgets.ballots.show.remove'),
+                    budget_ballot_line_path(id: investment.id,
+                                            budget_id: investment.budget_id,
+                                            investments_ids: investment_ids),
+                    class: "delete small expanded",
+                    method: :delete,
+                    remote: true %>
+      <% end %>
+    </div>
+
   <% else %>
-    <%= render 'budgets/ballot/add',
-               investment: investment,
-               investment_ids: @investments %>
+
+    <div class="add in-favor">
+      <p class="investment-project-amount">
+        <%= investment.formatted_price %>
+      </p>
+      <% if investment.should_show_ballots? %>
+        <%= link_to t("budget.investments.investment.add"),
+                    budget_ballot_lines_url(investment_id: investment.id,
+                                            budget_id: investment.budget_id,
+                                            investments_ids: investment_ids),
+                    class: "button button-support small expanded",
+                    title: t('budget.investments.investment.support_title'),
+                    method: :post,
+                    remote: true %>
+      <% end %>
+    </div>
+
   <% end %>
 
-  <% if reason.present? && !@ballot.has_investment?(investment) %>
+  <% if reason.present? && !investment_ballot.has_investment?(investment) %>
 
     <div class="no-supports-allowed" style='display:none'>
       <p>
@@ -18,7 +48,9 @@
               verify_account: link_to(t("votes.verify_account"), verification_path),
               signin: link_to(t("votes.signin"), new_user_session_path),
               signup: link_to(t("votes.signup"), new_user_registration_path),
-              my_heading: link_to(@ballot.try(:heading).try(:name), budget_investments_path(budget_id: @budget.id, heading_id: @ballot.try(:heading_id)))
+              my_heading: link_to(investment.heading.name,
+                                  budget_investments_path(budget_id: investment.budget_id,
+                                                          heading_id: investment.heading_id))
          ).html_safe %>
       </p>
     </div>
diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb
index e21b6dc00..e0ea250e4 100644
--- a/app/views/budgets/investments/_investment.html.erb
+++ b/app/views/budgets/investments/_investment.html.erb
@@ -59,7 +59,11 @@
 
           <div id="<%= dom_id(investment) %>_ballot"
                 class="small-12 medium-3 column text-center">
-            <%= render 'ballot', investment: investment %>
+                <%= render partial: '/budgets/investments/ballot', locals: {
+                  investment: investment,
+                  investment_ids: investment_ids,
+                  investment_ballot: investment_ballots[investment.budget]
+                } %>
           </div>
 
         <% end %>