From 6c205e7d67181fc1da1a2e644dfa2b705460aa18 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 19 May 2021 16:39:59 +0200 Subject: [PATCH] backports murph-skeleton --- core/Entity/Site/Page/Page.php | 4 ++++ core/Resources/views/admin/crud/index.html.twig | 2 +- core/Resources/views/site/tree_admin/navigation.html.twig | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/Entity/Site/Page/Page.php b/core/Entity/Site/Page/Page.php index eea44f1..689132e 100644 --- a/core/Entity/Site/Page/Page.php +++ b/core/Entity/Site/Page/Page.php @@ -242,6 +242,10 @@ class Page implements EntityInterface public function setOgImage($ogImage): self { + if ($this->ogImage !== null && $ogImage === null) { + return $this; + } + $this->ogImage = $ogImage; return $this; diff --git a/core/Resources/views/admin/crud/index.html.twig b/core/Resources/views/admin/crud/index.html.twig index 51b62af..8405953 100644 --- a/core/Resources/views/admin/crud/index.html.twig +++ b/core/Resources/views/admin/crud/index.html.twig @@ -130,7 +130,7 @@ {% endif %} {% endset -%} - + {% for config in configuration.fields('index') %} {% set attr = config.options.attr is defined ? config.options.attr : [] %} {% set action = config.options.action is defined ? config.options.action : null %} diff --git a/core/Resources/views/site/tree_admin/navigation.html.twig b/core/Resources/views/site/tree_admin/navigation.html.twig index 1d67993..a308f92 100644 --- a/core/Resources/views/site/tree_admin/navigation.html.twig +++ b/core/Resources/views/site/tree_admin/navigation.html.twig @@ -73,7 +73,7 @@ {% set edit = path('admin_site_node_edit', {entity: node.id}) %} {% set new = path('admin_site_node_new', {node: node.id}) %} -
+
{{ node.label }}