Merge pull request #66 from maximehuran/feature/fix-issue-filter

Fix issue on title fallback for meta title
monsieurbiz · Jun 3, 2024 · 8f15e98 · 8f15e98
2 parents 997695e + 10ce62d
commit 8f15e98
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
 
 

diff --git 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() }}
     <meta property="og:type" content="page" />
-    {% if page.metaTitle is not empty %}
-        <meta property="og:title" content="{{ page.metaTitle }}"/>
+    {% if metaTitle is not empty %}
+        <meta property="og:title" content="{{ metaTitle }}"/>
     {% endif %}
     {% if page.metaDescription is not empty %}
         <meta name="description" property="og:description" content="{{ page.metaDescription }}"/>