From 275785bef739bc3959cd7b1c671e53a30355c897 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Mon, 23 Jul 2018 20:21:59 +0200 Subject: bake : more for limit action links to defined controller methods --- .../plugins/CustomTheme/src/Template/Bake/Template/index.twig | 4 ++++ .../plugins/CustomTheme/src/Template/Bake/Template/view.twig | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig index 9c7437e..1bb6bb5 100644 --- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig +++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig @@ -108,7 +108,11 @@ $this->Form->setTemplates(['label' => '']); {% if associations.BelongsTo %} {% for alias, details in associations.BelongsTo if field == details.foreignKey %} {% set isKey = true %} +{% if BakeExtra.hasAction('view', details.controller) %} has('{{ details.property }}') ? $this->Html->link(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}->{{ details.property }}->{{ details.primaryKey[0] }}]) : '' ?> +{% else %} + has('{{ details.property }}') ? h(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}) : '' ?> +{% endif %} {% endfor %} {% endif %} {% if isKey is not same as(true) %} diff --git a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig index d56588e..a5563bf 100644 --- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig +++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig @@ -86,7 +86,11 @@ {% set details = associationFields[field] %} +{% if BakeExtra.hasAction('view', details.controller) %} has('{{ details.property }}') ? $this->Html->link(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}->{{ details.property }}->{{ details.primaryKey[0] }}]) : '' ?> +{% else %} + has('{{ details.property }}') ? h(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}) : '' ?> +{% endif %} {% else %} @@ -100,7 +104,11 @@ {% for alias, details in associations.HasOne %} +{% if BakeExtra.hasAction('view', details.controller) %} has('{{ details.property }}') ? $this->Html->link(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}->{{ details.property }}->{{ details.primaryKey[0] }}]) : '' ?> +{% else %} + has('{{ details.property }}') ? h(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}) : '' ?> +{% endif %} {% endfor %} {% endif %} -- cgit v1.1