From 1c653a7096109a0c99662c62b2ece8b2651749da Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Tue, 20 Feb 2018 18:17:02 +0100
Subject: [PATCH] Improve admin menu active item conditionals

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

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 6a63583a0..896574e31 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -67,8 +67,7 @@
             <%= link_to t('admin.menu.polls'), admin_polls_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "questions" ||
-                                    controller_name == "answers" ||
+          <li <%= "class=active" if %w(questions answers).include?(controller_name) ||
                                     controller.class.parent == Admin::Poll::Questions::Answers %>>
             <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
           </li>
@@ -82,12 +81,12 @@
             <%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
           </li>
 
-          <li <%= "class=active" if (controller_name == "polls" && action_name == "booth_assignments") || (controller_name == "booth_assignments" && action_name == "manage") %>>
+          <li <%= "class=active" if (controller_name == "polls" && action_name == "booth_assignments") ||
+                                    (controller_name == "booth_assignments" && action_name == "manage") %>>
             <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %>
           </li>
 
-          <li <%= "class=active" if controller_name == "shifts" ||
-                                    controller_name == "booths" &&
+          <li <%= "class=active" if %w(shifts booths).include?(controller_name) &&
                                     action_name == "available" %>>
             <%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %>
           </li>
@@ -122,7 +121,7 @@
           <%= link_to t("admin.menu.officials"), admin_officials_path %>
         </li>
 
-        <li <%= "class=active" if controller_name == "moderators" || controller_name == "activity" %>>
+        <li <%= "class=active" if %w(moderators activity).include?(controller_name) %>>
           <%= link_to t('admin.menu.moderators'), admin_moderators_path%>
         </li>