From 350d79d20a5517f7c00f38fe0ab7ce2e0e2907c7 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 6 Dec 2016 17:47:45 +0100
Subject: [PATCH] management menu: use && . Refactor bi conditions

---
 app/views/management/_menu.html.erb | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index 5ccaf8be6..050e5eb7f 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -16,64 +16,67 @@
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "proposals" and action_name == "new" %>>
+    <li <%= "class=active" if controller_name == "proposals" && action_name == "new" %>>
       <%= link_to new_management_proposal_path do %>
         <span class="icon-proposals"></span>
         <%= t("management.menu.create_proposal") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "proposals" and action_name == "index"  %>>
+    <li <%= "class=active" if controller_name == "proposals" && action_name == "index"  %>>
       <%= link_to management_proposals_path do %>
         <span class="icon-like"></span>
         <%= t("management.menu.support_proposals") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "spending_proposals" and action_name == "new" %>>
+    <li <%= "class=active" if controller_name == "spending_proposals" && action_name == "new" %>>
       <%= link_to new_management_spending_proposal_path do %>
         <span class="icon-budget"></span>
         <%= t("management.menu.create_spending_proposal") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "spending_proposals" and action_name == "index" %>>
+    <li <%= "class=active" if controller_name == "spending_proposals" && action_name == "index" %>>
       <%= link_to management_spending_proposals_path do %>
         <span class="icon-like"></span>
         <%= t("management.menu.support_spending_proposals") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "budget_investments" and action_name == "new" %>>
-      <%= link_to new_management_budgets_investment_path do %>
+    <li <%= "class=active" if (controller_name == "budget_investments" && action_name == "new") ||
+                              (controller_name == "budget" && action_name == 'create_investments') %>>
+      <%= link_to create_investments_management_budgets_path do %>
         <span class="icon-budget"></span>
         <%= t("management.menu.create_budget_investment") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "budget_investments" and action_name == "index" %>>
-      <%= link_to management_budgets_investments_path do %>
+    <li <%= "class=active" if (controller_name == "budget_investments" && action_name == "index") ||
+                              (controller_name == "budget" && action_name == "support_investments")%>>
+      <%= link_to support_investments_management_budgets_path do %>
         <span class="icon-like"></span>
         <%= t("management.menu.support_budget_investments") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "proposals" and action_name == "print" %>>
+    <li <%= "class=active" if controller_name == "proposals" && action_name == "print" %>>
       <%= link_to print_management_proposals_path do %>
         <span class="icon-print"></span>
         <%= t("management.menu.print_proposals") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "spending_proposals" and action_name == "print" %>>
+    <li <%= "class=active" if controller_name == "spending_proposals" && action_name == "print" %>>
       <%= link_to print_management_spending_proposals_path do %>
         <span class="icon-print"></span>
         <%= t("management.menu.print_spending_proposals") %>
       <% end %>
     </li>
 
-    <li <%= "class=active" if controller_name == "budget_investments" and action_name == "print" %>>
-      <%= link_to print_management_budgets_investments_path do %>
+    <li <%= "class=active" if (controller_name == "budget_investments" && action_name == "print") ||
+                              (controller_name == "budgets" && action_name == "print_investments") %>>
+      <%= link_to print_investments_management_budgets_path do %>
         <span class="icon-print"></span>
         <%= t("management.menu.print_budget_investments") %>
       <% end %>