diff --git a/decidim-admin/lib/decidim/admin/engine.rb b/decidim-admin/lib/decidim/admin/engine.rb index 115b713a33d9..7d9399cff7e9 100644 --- a/decidim-admin/lib/decidim/admin/engine.rb +++ b/decidim-admin/lib/decidim/admin/engine.rb @@ -173,7 +173,10 @@ class Engine < ::Rails::Engine decidim_admin.root_path, icon_name: "dashboard", position: 1, - active: ["decidim/admin/dashboard" => :show] + active: [%w( + decidim/admin/dashboard + decidim/admin/metrics + ), []] menu.add_item :moderations, I18n.t("menu.moderation", scope: "decidim.admin"), @@ -208,10 +211,15 @@ class Engine < ::Rails::Engine decidim/admin/user_groups_csv_verifications decidim/admin/officializations decidim/admin/impersonatable_users + decidim/admin/conflicts decidim/admin/moderated_users decidim/admin/managed_users/impersonation_logs decidim/admin/managed_users/promotions decidim/admin/authorization_workflows + decidim/verifications/id_documents/admin/pending_authorizations + decidim/verifications/id_documents/admin/config + decidim/verifications/postal_letter/admin/pending_authorizations + decidim/verifications/csv_census/admin/census ), []], if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user) @@ -238,6 +246,8 @@ class Engine < ::Rails::Engine decidim/admin/scopes decidim/admin/scope_types decidim/admin/areas decidim/admin/area_types + decidim/admin/help_sections + decidim/admin/organization_external_domain_whitelist ), [] ], diff --git a/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb b/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb index 0e43ef8af459..763aeb234275 100644 --- a/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb +++ b/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb @@ -103,7 +103,9 @@ class AdminEngine < ::Rails::Engine decidim_admin_assemblies.assemblies_path, icon_name: "dial", position: 2.2, - active: :inclusive, + active: is_active_link?(decidim_admin_assemblies.assemblies_path) || + is_active_link?(decidim_admin_assemblies.assemblies_types_path) || + is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path), if: allowed_to?(:enter, :space_area, space_name: :assemblies) end end diff --git a/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb b/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb index 9d10ef54c671..965cb4281649 100644 --- a/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb +++ b/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb @@ -90,7 +90,13 @@ class AdminEngine < ::Rails::Engine decidim_admin_initiatives.initiatives_path, icon_name: "chat", position: 2.4, - active: :inclusive, + active: is_active_link?(decidim_admin_initiatives.initiatives_path) || + is_active_link?(decidim_admin_initiatives.initiatives_types_path) || + is_active_link?( + decidim_admin_initiatives.edit_initiatives_setting_path( + Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization) + ) + ), if: allowed_to?(:enter, :space_area, space_name: :initiatives) end end diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb index ac5ab390bc96..7e790fe37c0c 100644 --- a/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb +++ b/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb @@ -103,7 +103,8 @@ class AdminEngine < ::Rails::Engine icon_name: "target", position: 2, active: is_active_link?(decidim_admin_participatory_processes.participatory_processes_path, :inclusive) || - is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path, :inclusive), + is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path, :inclusive) || + is_active_link?(decidim_admin_participatory_processes.participatory_process_types_path), if: allowed_to?(:enter, :space_area, space_name: :processes) || allowed_to?(:enter, :space_area, space_name: :process_groups) end end