From 2629837306fdfb97a6244e55a5cdad373fe8ff62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Checa?= <MariaCheca@users.noreply.github.com>
Date: Fri, 22 Sep 2017 17:25:33 +0200
Subject: [PATCH] Fixed admin menu active states

---
 app/helpers/admin_helper.rb    | 4 ++--
 app/views/admin/_menu.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index f9c2e8c69..06fb158a4 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -17,7 +17,7 @@ module AdminHelper
   end
 
   def menu_moderated_content?
-    ["proposals", "debates", "comments", "hidden_users"].include? controller_name
+    ["proposals", "debates", "comments", "hidden_users"].include? controller_name && controller.class.parent != Admin::Legislation
   end
 
   def menu_budget?
@@ -39,7 +39,7 @@ module AdminHelper
   def menu_customization?
     ["pages", "images", "content_blocks"].include? controller_name
   end
-  
+
   def official_level_options
     options = [["", 0]]
     (1..5).each do |i|
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 11d58adc8..168f8c31b 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -19,7 +19,7 @@
         <strong><%= t("admin.menu.title_moderated_content") %></strong>
       </a>
       <ul <%= "class=is-active" if menu_moderated_content? %>>
-        <li <%= "class=active" if controller_name == "proposals" %>>
+        <li <%= "class=active" if controller_name == "proposals" && controller.class.parent != Admin::Legislation %>>
           <%= link_to t("admin.menu.hidden_proposals"), admin_proposals_path %>
         </li>