Remove questions link on admin polls menu

app/helpers/admin_helper.rb

@@ -37,12 +37,9 @@ module AdminHelper
     ["spending_proposals"].include?(controller_name)
   end
 
-  def menu_poll?
-    %w[polls active_polls recounts results].include?(controller_name)
-  end
-
   def menu_polls?
-    menu_poll? || %w[questions answers].include?(controller_name)
+    %w[polls active_polls recounts results questions answers].include?(controller_name) ||
+    controller.class.parent == Admin::Poll::Questions::Answers
   end
 
   def menu_booths?
@@ -54,7 +51,8 @@ module AdminHelper
   end
 
   def menu_settings?
-    ["settings", "tags", "geozones", "images", "content_blocks"].include?(controller_name)
+    ["settings", "tags", "geozones", "images", "content_blocks"].include?(controller_name) &&
+    controller.class.parent != Admin::Poll::Questions::Answers
   end
 
   def menu_customization?

app/views/admin/_menu.html.erb

@@ -10,21 +10,11 @@
     <% end %>
 
     <% if feature?(:polls) %>
-      <li class="section-title">
+      <li class="section-title <%= "is-active" if menu_polls? %>">
-        <a href="#">
+        <%= link_to admin_polls_path do %>
           <span class="icon-checkmark-circle"></span>
-          <strong><%= t("admin.menu.title_polls") %></strong>
+          <strong><%= t("admin.menu.polls") %></strong>
-        </a>
+        <% end %>
-        <ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>>
-          <li <%= "class=is-active" if menu_poll? %>>
-            <%= link_to t("admin.menu.polls"), admin_polls_path %>
-          </li>
-
-          <li <%= "class=is-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>
-        </ul>
       </li>
     <% end %>
 

config/locales/en/admin.yml

@@ -582,7 +582,6 @@ en:
       activity: Moderator activity
       admin: Admin menu
       banner: Manage banners
-      poll_questions: Questions
       proposals: Proposals
       proposals_topics: Proposals topics
       budgets: Participatory budgets
@@ -634,7 +633,6 @@ en:
             update: "Update Block"
       title_moderated_content: Moderated content
       title_budgets: Budgets
-      title_polls: Polls
       title_profiles: Profiles
       title_settings: Settings
       title_site_customization: Site content

config/locales/es/admin.yml

@@ -581,7 +581,6 @@ es:
       activity: Actividad de moderadores
       admin: Menú de administración
       banner: Gestionar banners
-      poll_questions: Preguntas
       proposals: Propuestas
       proposals_topics: Temas de propuestas
       budgets: Presupuestos participativos
@@ -633,7 +632,6 @@ es:
             update: "Actualizar Bloque"
       title_moderated_content: Contenido moderado
       title_budgets: Presupuestos
-      title_polls: Votaciones
       title_profiles: Perfiles
       title_settings: Configuración
       title_site_customization: Contenido del sitio

spec/features/admin/poll/polls_spec.rb

@@ -12,13 +12,10 @@ feature 'Admin polls' do
                   "edit_admin_poll_path",
                   %w[name summary description]
 
-  scenario 'Index empty', :js do
+  scenario "Index empty", :js do
     visit admin_root_path
 
     click_link "Polls"
-    within('#polls_menu') do
-      click_link "Polls"
-    end
 
     expect(page).to have_content "There are no polls"
   end
@@ -31,9 +28,6 @@ feature 'Admin polls' do
     visit admin_root_path
 
     click_link "Polls"
-    within("#polls_menu") do
-      click_link "Polls"
-    end
 
     expect(page).to have_content "List of polls"
     expect(page).to have_css ".poll", count: 3