Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing active actions on admin navigation menu #9904

Merged
merged 6 commits into from
Oct 25, 2022
Merged

Add missing active actions on admin navigation menu #9904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b042037
Add missing actions on User's admin navigation menu
andreslucena Oct 17, 2022
77acb7b
Add missing actions on Settings' admin navigation menu
andreslucena Oct 17, 2022
5e42072
Add missing actions on Assemblies' admin navigation menu
andreslucena Oct 17, 2022
3df977f
Add missing actions on Initiatives' admin navigation menu
andreslucena Oct 17, 2022
1322a1a
Add missing actions on Processes' admin navigation menu
andreslucena Oct 17, 2022
b161fd5
Add missing actions on Dashboard's admin navigation menu
andreslucena Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion decidim-admin/lib/decidim/admin/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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)

Expand All @@ -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
),
[]
],
Expand Down
4 changes: 3 additions & 1 deletion decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion decidim-initiatives/lib/decidim/initiatives/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down