From 323b05f4de37cbdcf6a118baeb9904180e503798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20R=C3=ADos=20Flores?= <periflo90@gmail.com>
Date: Fri, 29 Sep 2017 12:30:02 +0200
Subject: [PATCH 1/3] Issue #1901: Budget related entries in Management
 shouldn't appear if budgets are globally disabled.

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

diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index 050e5eb7f..e70ec9ee5 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -44,21 +44,25 @@
       <% end %>
     </li>
 
-    <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>
+    <% if Setting['feature.budgets'] %>
+      <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>
+    <% end %>
 
-    <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>
+    <% if Setting['feature.budgets'] %>
+      <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>
+    <% end %>
 
     <li <%= "class=active" if controller_name == "proposals" && action_name == "print" %>>
       <%= link_to print_management_proposals_path do %>
@@ -74,13 +78,15 @@
       <% end %>
     </li>
 
-    <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 %>
-    </li>
+    <% if Setting['feature.budgets'] %>
+      <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 %>
+      </li>
+    <% end %>
 
 
     <li>

From 693030ff1791d93824e938907fc512399286d033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20R=C3=ADos=20Flores?= <periflo90@gmail.com>
Date: Mon, 9 Oct 2017 12:26:34 +0200
Subject: [PATCH 2/3] Wrapped two links under the same if clause.

---
 app/views/management/_menu.html.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index e70ec9ee5..51df9518a 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -52,9 +52,7 @@
           <%= t("management.menu.create_budget_investment") %>
         <% end %>
       </li>
-    <% end %>
 
-    <% if Setting['feature.budgets'] %>
       <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 %>

From 87d4fa92b41bc87ccd2b5649cb694e174af00acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20R=C3=ADos=20Flores?= <periflo90@gmail.com>
Date: Mon, 9 Oct 2017 13:09:09 +0200
Subject: [PATCH 3/3] Wrapped the last link under the same if clause.

---
 app/views/management/_menu.html.erb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index 51df9518a..b01bbaf0c 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -60,6 +60,14 @@
           <%= t("management.menu.support_budget_investments") %>
         <% end %>
       </li>
+
+        <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 %>
+        </li>
     <% end %>
 
     <li <%= "class=active" if controller_name == "proposals" && action_name == "print" %>>
@@ -76,17 +84,6 @@
       <% end %>
     </li>
 
-    <% if Setting['feature.budgets'] %>
-      <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 %>
-      </li>
-    <% end %>
-
-
     <li>
       <%= link_to new_management_user_invite_path do %>
         <span class="icon-letter"></span>