From 3c2b5281e8d2a4bd159bb2e30ad190ea5ea18cd4 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Fri, 22 Sep 2017 18:05:53 +0200
Subject: [PATCH] Fix Admin Polls menu active flags

---
 app/views/admin/_menu.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 11d58adc8..a2173edf6 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -60,12 +60,12 @@
           <span class="icon-checkmark-circle"></span>
           <strong><%= t("admin.menu.title_polls") %></strong>
         </a>
-        <ul id="polls_menu" <%= "class=is-active" if menu_polls? && controller.class.parent == Admin::Poll::QuestionsController %>>
+        <ul id="polls_menu" <%= "class=is-active" if menu_polls? && controller.class.parent == Admin::Poll %>>
           <li <%= "class=active" if ["polls", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name %>>
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "questions" && controller.class.parent == Admin::Poll::QuestionsController %>>
+          <li <%= "class=active" if current_page?(admin_questions_path) %>>
             <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
           </li>