diff --git a/app/components/admin/menu_component.html.erb b/app/components/admin/menu_component.html.erb index 40e501dc5..750ee18ec 100644 --- a/app/components/admin/menu_component.html.erb +++ b/app/components/admin/menu_component.html.erb @@ -22,7 +22,7 @@ <% end %> <% if feature?(:legislation) %> -
  • "> +
  • "> <%= link_to t("admin.menu.legislation"), admin_legislation_processes_path, class: "legislation-link" %>
  • <% end %> @@ -69,7 +69,7 @@ banners_link, information_texts_link, documents_link, - class: ("is-active" if customization? && controller.class.parent != Admin::Poll::Questions::Answers) + class: ("is-active" if customization? && controller.class.module_parent != Admin::Poll::Questions::Answers) ) %> diff --git a/app/components/admin/menu_component.rb b/app/components/admin/menu_component.rb index 15e15f2b1..4ef5d262f 100644 --- a/app/components/admin/menu_component.rb +++ b/app/components/admin/menu_component.rb @@ -4,7 +4,7 @@ class Admin::MenuComponent < ApplicationComponent private def moderated_content? - moderated_sections.include?(controller_name) && controller.class.parent != Admin::Legislation + moderated_sections.include?(controller_name) && controller.class.module_parent != Admin::Legislation end def moderated_sections @@ -17,7 +17,7 @@ class Admin::MenuComponent < ApplicationComponent end def polls? - controller.class.parent == Admin::Poll::Questions::Answers || + controller.class.module_parent == Admin::Poll::Questions::Answers || %w[polls active_polls recounts results questions answers].include?(controller_name) && action_name != "booth_assignments" end @@ -35,7 +35,7 @@ class Admin::MenuComponent < ApplicationComponent controllers_names = ["settings", "tags", "geozones", "images", "content_blocks", "local_census_records", "imports"] controllers_names.include?(controller_name) && - controller.class.parent != Admin::Poll::Questions::Answers + controller.class.module_parent != Admin::Poll::Questions::Answers end def customization? @@ -57,7 +57,7 @@ class Admin::MenuComponent < ApplicationComponent def local_census_records? controller_name == "local_census_records" || - (controller_name == "imports" && controller.class.parent == Admin::LocalCensusRecords) + (controller_name == "imports" && controller.class.module_parent == Admin::LocalCensusRecords) end def messages_menu_active? @@ -69,11 +69,11 @@ class Admin::MenuComponent < ApplicationComponent end def sdg_managers? - controller_name == "managers" && controller.class.parent == Admin::SDG + controller_name == "managers" && controller.class.module_parent == Admin::SDG end def managers? - controller_name == "managers" && controller.class.parent == Admin + controller_name == "managers" && controller.class.module_parent == Admin end def officers_link @@ -320,7 +320,7 @@ class Admin::MenuComponent < ApplicationComponent [ t("admin.menu.site_customization.images"), admin_site_customization_images_path, - controller_name == "images" && controller.class.parent != Admin::Poll::Questions::Answers + controller_name == "images" && controller.class.module_parent != Admin::Poll::Questions::Answers ] end diff --git a/app/helpers/translatable_form_helper.rb b/app/helpers/translatable_form_helper.rb index fea9b04ef..8b15255c3 100644 --- a/app/helpers/translatable_form_helper.rb +++ b/app/helpers/translatable_form_helper.rb @@ -8,7 +8,7 @@ module TranslatableFormHelper end def backend_translations_enabled? - (controller.class.parents & [Admin, Management, Valuation, SDGManagement]).any? + (controller.class.module_parents & [Admin, Management, Valuation, SDGManagement]).any? end def highlight_translation_html_class diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 1a78ad60a..47cba9f90 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -27,7 +27,7 @@ "aria-hidden": true, class: "button hollow expanded" %> <%= render "layouts/flash" %> - <%= render "layouts/officing_booth" if controller.class.parent == Officing && session[:booth_id].present? %> + <%= render "layouts/officing_booth" if controller.class.module_parent == Officing && session[:booth_id].present? %> <%= yield %> diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index 1c81f389a..4df7ff1d8 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -22,7 +22,7 @@
  • <%= layout_menu_link_to t("layouts.header.poll_questions"), polls_path, - controller_name == "polls" || (controller_name == "questions" && controller.class.parent == Polls), + controller_name == "polls" || (controller_name == "questions" && controller.class.module_parent == Polls), accesskey: "3" %>
  • <% end %> @@ -30,7 +30,7 @@
  • <%= layout_menu_link_to t("layouts.header.collaborative_legislation"), legislation_processes_path, - controller.class.parent == Legislation, + controller.class.module_parent == Legislation, accesskey: "4" %>
  • <% end %>