From 3ad648dd63c2d6a9e26dd20104e66144b2317953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Tue, 27 Dec 2016 17:47:54 +0100
Subject: [PATCH] display correct submenu in admin menu

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

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index ec99c240b..d0b0765dd 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -17,7 +17,7 @@ module AdminHelper
   end
 
   def menu_polls?
-    ["polls", "questions", "officers", "booths"].include? controller_name
+    ["polls", "questions", "officers", "booths", "officer_assignments"].include? controller_name
   end
 
   def menu_profiles?
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index b2f4eb5d8..078dad9b1 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -60,7 +60,7 @@
           <strong><%= t("admin.menu.title_polls") %></strong>
         </a>
         <ul id="polls_menu" <%= "class=is-active" if menu_polls? %>>
-          <li <%= 'class=active' if controller_name == 'polls' %>>
+          <li <%= 'class=active' if ["polls", "officer_assignments"].include? controller_name  %>>
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>