From 70f84fe985f5dd18bc1686e2473a9fced68d8df7 Mon Sep 17 00:00:00 2001 From: Maxime Huran Date: Mon, 3 Jun 2024 14:09:07 +0200 Subject: [PATCH 1/2] Add no interaction while setup plugin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cac256b..93113b2 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ setup_application: $(MAKE) ${APP_DIR}/php.ini (cd ${APP_DIR} && ${COMPOSER} install --no-interaction) $(MAKE) apply_dist - (cd ${APP_DIR} && ${COMPOSER} require --no-progress monsieurbiz/${PLUGIN_NAME}="*@dev") + (cd ${APP_DIR} && ${COMPOSER} require --no-progress --no-interaction monsieurbiz/${PLUGIN_NAME}="*@dev") rm -rf ${APP_DIR}/var/cache From 10ce62dcf0c257625f9647ee970a36bc0e25fbf6 Mon Sep 17 00:00:00 2001 From: Maxime Huran Date: Mon, 3 Jun 2024 14:13:39 +0200 Subject: [PATCH 2/2] fix: manage fallback on page title for meta title correctly --- src/Resources/views/Shop/Page/show.html.twig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Resources/views/Shop/Page/show.html.twig b/src/Resources/views/Shop/Page/show.html.twig index 575eb46..1d023f1 100644 --- a/src/Resources/views/Shop/Page/show.html.twig +++ b/src/Resources/views/Shop/Page/show.html.twig @@ -1,12 +1,14 @@ {% extends '@SyliusShop/layout.html.twig' %} -{% block title %}{{ page.metaTitle|page.title }}{% endblock %} +{% set metaTitle = page.metaTitle ? page.metaTitle : page.title %} + +{% block title %}{{ metaTitle }}{% endblock %} {% block metatags %} {{ parent() }} - {% if page.metaTitle is not empty %} - + {% if metaTitle is not empty %} + {% endif %} {% if page.metaDescription is not empty %}