From 4a5276f0898fbb2ec449b1ccd00f6ac77ec0fb3a Mon Sep 17 00:00:00 2001
From: Amaia Castro <amaia@amaiac.net>
Date: Wed, 11 Jan 2017 15:34:41 +0100
Subject: [PATCH] Revert change in admin namespace helper and redefine it in
 the controller

---
 app/controllers/admin/legislation/base_controller.rb | 9 +++++++++
 app/helpers/admin_helper.rb                          | 4 ++--
 app/views/admin/legislation/_menu.html.erb           | 1 -
 3 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 app/views/admin/legislation/_menu.html.erb

diff --git a/app/controllers/admin/legislation/base_controller.rb b/app/controllers/admin/legislation/base_controller.rb
index 047180ab3..b6c62f426 100644
--- a/app/controllers/admin/legislation/base_controller.rb
+++ b/app/controllers/admin/legislation/base_controller.rb
@@ -2,4 +2,13 @@ class Admin::Legislation::BaseController < Admin::BaseController
   include FeatureFlags
 
   feature_flag :legislation
+
+  helper_method :namespace
+
+  private
+
+    def namespace
+      "admin"
+    end
+
 end
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index f14269fb3..b38b0acf9 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -5,7 +5,7 @@ module AdminHelper
   end
 
   def official_level_options
-    options = [["",0]]
+    options = [["", 0]]
     (1..5).each do |i|
       options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(': '), i]
     end
@@ -23,7 +23,7 @@ module AdminHelper
   private
 
     def namespace
-      controller.class.parent.name.downcase.gsub("::", "/")
+      controller.class.parent.name.downcase
     end
 
 end
diff --git a/app/views/admin/legislation/_menu.html.erb b/app/views/admin/legislation/_menu.html.erb
deleted file mode 100644
index 38c8bc5c4..000000000
--- a/app/views/admin/legislation/_menu.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render "admin/menu" %>