diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index d9ff773fc..f3f3a9715 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -33,12 +33,14 @@ module AdminHelper end def menu_polls? - %w[polls active_polls recounts results questions answers].include?(controller_name) || - controller.class.parent == Admin::Poll::Questions::Answers + controller.class.parent == Admin::Poll::Questions::Answers || + %w[polls active_polls recounts results questions answers].include?(controller_name) && + action_name != "booth_assignments" end def menu_booths? - %w[officers booths shifts booth_assignments officer_assignments].include?(controller_name) + %w[officers booths shifts booth_assignments officer_assignments].include?(controller_name) || + controller_name == "polls" && action_name == "booth_assignments" end def menu_profiles? diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 16e860b1f..525dbf770 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -57,7 +57,7 @@ <%= t("admin.menu.title_booths") %> -