From 853cddd0437f56d596e3822cd37f0ee7d7ede6ad Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Wed, 2 Oct 2024 22:50:14 +0200 Subject: [PATCH] fix(manager): regression on accesible actions introduced in 0ccb18 --- app/views/manager/instructeurs/show.html.erb | 2 +- app/views/manager/outdated_procedures/_collection.html.erb | 2 +- app/views/manager/outdated_procedures/index.html.erb | 2 +- app/views/manager/procedures/show.html.erb | 2 +- app/views/manager/published_procedures/index.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/manager/instructeurs/show.html.erb b/app/views/manager/instructeurs/show.html.erb index 7c71ef8a6..b2ef2c6e1 100644 --- a/app/views/manager/instructeurs/show.html.erb +++ b/app/views/manager/instructeurs/show.html.erb @@ -29,7 +29,7 @@ as well as a link to its edit page. 'Modifier', [:edit, namespace, page.resource], class: "button", - ) if accessible_action?(:edit, page.resource) && show_action?(:edit, page.resource) %> + ) if accessible_action?(page.resource, :edit) %> <%= link_to 'Réinviter', reinvite_manager_instructeur_path(instructeur), method: :post, class: 'button' %> diff --git a/app/views/manager/outdated_procedures/_collection.html.erb b/app/views/manager/outdated_procedures/_collection.html.erb index 1a966d96b..6f48a14e1 100644 --- a/app/views/manager/outdated_procedures/_collection.html.erb +++ b/app/views/manager/outdated_procedures/_collection.html.erb @@ -78,7 +78,7 @@ to display a collection of resources in an HTML table. <% collection_presenter.attributes_for(resource).each do |attribute| %> - <% if show_action? :show, resource -%> + <% if accessible_action?(resource, :show) -%> + ) if accessible_action?(page.resource_name, :new) %> diff --git a/app/views/manager/procedures/show.html.erb b/app/views/manager/procedures/show.html.erb index 82ff536cb..703c492d1 100644 --- a/app/views/manager/procedures/show.html.erb +++ b/app/views/manager/procedures/show.html.erb @@ -31,7 +31,7 @@ as well as a link to its edit page. t("administrate.actions.edit_resource", name: page.page_title), [:edit, namespace, page.resource], class: "button", - ) if accessible_action?(:edit, page.resource) %> + ) if accessible_action?(page.resource, :edit) %> <%= link_to 'Aperçu', apercu_admin_procedure_path(procedure), class: 'button' %> diff --git a/app/views/manager/published_procedures/index.html.erb b/app/views/manager/published_procedures/index.html.erb index e2339dae1..05754ba9e 100644 --- a/app/views/manager/published_procedures/index.html.erb +++ b/app/views/manager/published_procedures/index.html.erb @@ -48,7 +48,7 @@ It renders the `_table` partial to display details about the resources. ), [:new, namespace, page.resource_path.to_sym], class: "button", - ) if accessible_action?(:new, page.resource) && show_action?(:new, new_resource) %> + ) if accessible_action?(page.resource_name, :new) %>