From 6bc591472a6c26282c72f0842d6702e764376660 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 23 Nov 2023 11:42:21 +0100
Subject: [PATCH 1/3] IBX-7159: Fix preview back button 500

---
 src/bundle/Controller/ContentController.php               | 2 ++
 .../views/themes/admin/content/content_preview.html.twig  | 8 +++++++-
 src/lib/Menu/ContentRightSidebarBuilder.php               | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php
index 5352b23540..a36ae38c57 100644
--- a/src/bundle/Controller/ContentController.php
+++ b/src/bundle/Controller/ContentController.php
@@ -351,6 +351,7 @@ public function previewAction(
         ?Location $location = null
     ): Response {
         $preselectedSiteAccess = $request->query->get('preselectedSiteAccess');
+        $referrer = $request->query->get('referrer');
 
         if (null === $languageCode) {
             $languageCode = $content->contentInfo->mainLanguageCode;
@@ -396,6 +397,7 @@ public function previewAction(
             'siteaccesses' => $siteAccessesList,
             'version_no' => $versionNo ?? $content->getVersionInfo()->versionNo,
             'preselected_site_access' => $preselectedSiteAccess,
+            'referrer' => $referrer ?? 'content_draft_edit',
         ]);
     }
 
diff --git a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
index bda6393db1..abe85ce6dd 100644
--- a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
@@ -12,9 +12,15 @@
 {% block header_row %}
     <div class="ibexa-preview-header">
         <div class="ibexa-preview-header__item ibexa-preview-header__item--back">
+            {% if referrer == 'content_view' %}
+                {% set back_url = url('ibexa.content.view', { 'contentId': content.id, 'locationId': location.id }) %}
+            {% elseif referrer == 'content_draft_edit' %}
+                {% set back_url = url('ibexa.content.draft.edit', {'contentId': content.id, 'versionNo': version_no, 'language': language_code, 'locationId': is_published ? location.id : null}) %}
+            {% endif %}
+
             <a
                 class="ibexa-preview-header__link btn ibexa-btn ibexa-btn--ghost"
-                href="{{ url('ibexa.content.draft.edit', {'contentId': content.id, 'versionNo': version_no, 'language': language_code, 'locationId': is_published ? location.id : null}) }}"
+                href="{{ back_url }}"
             >
                 <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path('back') }}"></use>
diff --git a/src/lib/Menu/ContentRightSidebarBuilder.php b/src/lib/Menu/ContentRightSidebarBuilder.php
index d185ce84de..30f0356a8b 100644
--- a/src/lib/Menu/ContentRightSidebarBuilder.php
+++ b/src/lib/Menu/ContentRightSidebarBuilder.php
@@ -496,6 +496,7 @@ private function getContentPreviewItem(
                     'versionNo' => $content->getVersionInfo()->versionNo,
                     'languageCode' => $languageCode,
                     'locationId' => $location->id,
+                    'referrer' => 'content_view',
                 ],
             ];
         } else {

From 1f4033347d20ceeee17775629f11951ed69da0b2 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 23 Nov 2023 11:44:51 +0100
Subject: [PATCH 2/3] default

---
 .../views/themes/admin/content/content_preview.html.twig        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
index abe85ce6dd..7df5eee336 100644
--- a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
@@ -20,7 +20,7 @@
 
             <a
                 class="ibexa-preview-header__link btn ibexa-btn ibexa-btn--ghost"
-                href="{{ back_url }}"
+                href="{{ back_url|default('') }}"
             >
                 <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path('back') }}"></use>

From 403a94395cc798591c9857a6780ad4a1c2466b90 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 23 Nov 2023 13:21:40 +0100
Subject: [PATCH 3/3] default content_view url

---
 .../admin/content/content_preview.html.twig    | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
index 7df5eee336..4336621ffd 100644
--- a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig
@@ -12,15 +12,23 @@
 {% block header_row %}
     <div class="ibexa-preview-header">
         <div class="ibexa-preview-header__item ibexa-preview-header__item--back">
-            {% if referrer == 'content_view' %}
-                {% set back_url = url('ibexa.content.view', { 'contentId': content.id, 'locationId': location.id }) %}
-            {% elseif referrer == 'content_draft_edit' %}
-                {% set back_url = url('ibexa.content.draft.edit', {'contentId': content.id, 'versionNo': version_no, 'language': language_code, 'locationId': is_published ? location.id : null}) %}
+            {% if referrer == 'content_draft_edit' %}
+                {% set back_url = url('ibexa.content.draft.edit', {
+                    contentId: content.id,
+                    versionNo: version_no,
+                    language: language_code,
+                    locationId: is_published ? location.id : null,
+                }) %}
+            {% else %}
+                {% set back_url = url('ibexa.content.view', {
+                    contentId: content.id,
+                    locationId: location.id,
+                }) %}
             {% endif %}
 
             <a
                 class="ibexa-preview-header__link btn ibexa-btn ibexa-btn--ghost"
-                href="{{ back_url|default('') }}"
+                href="{{ back_url }}"
             >
                 <svg class="ibexa-icon ibexa-icon--small-medium">
                     <use xlink:href="{{ ibexa_icon_path('back') }}"></use>