From f873bff5c62484e8c1525cb1ff05b2b0818513e6 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Tue, 20 Feb 2018 22:32:19 +0100
Subject: [PATCH] Fix admin menu controller name conditionals

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

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index c8dcfbbe2..134725cda 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -63,7 +63,7 @@
         </a>
         <ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>>
           <li <%= "class=active" if controller_name == "polls" && action_name != "booth_assignments" ||
-                                    (["booth_assignments", "officer_assignments", "recounts", "results"].include? controller_name) %>>
+                                    %w(booth_assignments officer_assignments recounts results).include?(controller_name) %>>
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>
 
@@ -198,12 +198,12 @@
       </li>
     <% end %>
 
-    <li class="section-title">
+    <li class="section-title" <%= "class=active" if %w(newsletters emails_download).include?(controller_name) %>>
       <a href="#">
         <span class="icon-zip"></span>
         <strong><%= t("admin.menu.emails") %></strong>
       </a>
-      <ul id="emails_menu" <%= "class=is-active" if controller_name == "newsletters" || "emails_download" %>>
+      <ul id="emails_menu" <%= "class=is-active" if %w(newsletters emails_download).include?(controller_name) %>>
         <li <%= "class=active" if controller_name == "newsletters" %>>
           <%= link_to t("admin.menu.newsletters"), admin_newsletters_path %>
         </li>