Task: open pdf in new tab

pimcore · Jan 7, 2025 · b1273fe · b1273fe
1 parent 01789a3
commit b1273fe
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 14 deletions.
diff --git a/src/Controller/Admin/Asset/AssetController.php b/src/Controller/Admin/Asset/AssetController.php
@@ -37,6 +37,7 @@
 use Pimcore\Messenger\AssetUpdateTasksMessage;
 use Pimcore\Model;
 use Pimcore\Model\Asset;
+use Pimcore\Model\Asset\Enum\PdfScanStatus;
 use Pimcore\Model\DataObject\ClassDefinition\Data\ManyToManyRelation;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\Element;
@@ -950,10 +951,12 @@ public function showVersionAction(Request $request, Environment $twig): Response
         }
 
         if ($asset instanceof Asset\Document && $asset->getMimeType() === self::PDF_MIMETYPE) {
-            $scanResponse = $this->getResponseByScanStatus($asset, false);
-            if ($scanResponse) {
-                return $scanResponse;
-            }
+            $previewData = ['thumbnailPath' => ''];
+            $previewData['assetPath'] = $asset->getRealFullPath();
+            return $this->render(
+                '@PimcoreAdmin/admin/asset/get_preview_pdf_open_in_new_tab.html.twig',
+                $previewData
+            );
         }
 
         Tool\UserTimezone::setUserTimezone($request->query->get('userTimezone'));
@@ -1450,8 +1453,23 @@ public function getPreviewDocumentAction(
         if ($asset->isAllowed('view')) {
             if ($asset instanceof Asset\Document && $asset->getMimeType() === self::PDF_MIMETYPE) {
                 $scanResponse = $this->getResponseByScanStatus($asset);
-                if ($scanResponse) {
-                    return $scanResponse;
+                $openPdfConfig = Config::getSystemConfiguration('assets')['document']['open_pdf_in_new_tab'];
+
+                if ($openPdfConfig === 'all-pdfs' ||
+                ($openPdfConfig === 'only-unsafe' && $scanResponse === PdfScanStatus::UNSAFE)) {
+                    $thumbnail = $asset->getImageThumbnail(Asset\Image\Thumbnail\Config::getPreviewConfig());
+                    $previewData = ['thumbnailPath' => $thumbnail->getPath()];
+                    $previewData['assetPath'] = $asset->getRealFullPath();
+                    return $this->render(
+                        '@PimcoreAdmin/admin/asset/get_preview_pdf_open_in_new_tab.html.twig',
+                        $previewData
+                    );
+                }
+
+                if ($scanResponse === PdfScanStatus::IN_PROGRESS) {
+                    return $this->render('@PimcoreAdmin/admin/asset/get_preview_pdf_in_progress.html.twig');
+                } elseif ($scanResponse === PdfScanStatus::UNSAFE) {
+                    return $this->render('@PimcoreAdmin/admin/asset/get_preview_pdf_unsafe.html.twig');
                 }
             }
 
@@ -1470,7 +1488,7 @@ public function getPreviewDocumentAction(
         }
     }
 
-    private function getResponseByScanStatus(Asset\Document $asset, bool $processBackground = true): ?Response
+    private function getResponseByScanStatus(Asset\Document $asset, bool $processBackground = true): ?PdfScanStatus
     {
         if (!Config::getSystemConfiguration('assets')['document']['scan_pdf']) {
             return null;
@@ -1486,11 +1504,7 @@ private function getResponseByScanStatus(Asset\Document $asset, bool $processBac
             }
         }
 
-        return match($scanStatus) {
-            Asset\Enum\PdfScanStatus::IN_PROGRESS => $this->render('@PimcoreAdmin/admin/asset/get_preview_pdf_in_progress.html.twig'),
-            Asset\Enum\PdfScanStatus::UNSAFE => $this->render('@PimcoreAdmin/admin/asset/get_preview_pdf_unsafe.html.twig'),
-            default => null,
-        };
+        return $scanStatus;
     }
 
     /**

diff --git a/templates/admin/asset/get_preview_pdf_open_in_new_tab.html.twig b/templates/admin/asset/get_preview_pdf_open_in_new_tab.html.twig
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+
+    <style>
+
+        /* hide from ie on mac \*/
+        html {
+            height: 100%;
+        }
+        /* end hide */
+
+        body {
+            height: 100%;
+            margin: 0;
+            padding: 0;
+            background: #EEE;
+        }
+
+        #container {
+            text-align: center;
+            width: 100%;
+        }
+
+        {% if not thumbnailPath %}
+            #container {
+                padding-top: 200px;
+            }
+        {% endif %}
+
+
+        img {
+            height: 600px;
+            margin: 4px;
+        }
+
+    </style>
+</head>
+
+<body>
+
+<div id="container">
+    {% if thumbnailPath %}
+        <a href="{{ assetPath }}" target="_blank">
+            <img alt="preview" src="{{ thumbnailPath }}" />
+        </a>
+    {% else %}
+        <span>{{ 'no_preview_available'|trans([], 'admin') }}</span>
+    {% endif %}
+    <div>
+        <a href="{{ assetPath }}" target="_blank">{{ 'open_in_new_window'|trans([], 'admin') }}</a>
+    </div>
+</div>
+
+
+</body>
+</html>
diff --git a/templates/admin/asset/show_version_unknown.html.twig b/templates/admin/asset/show_version_unknown.html.twig
@@ -26,7 +26,7 @@
 <table id="wrapper" cellpadding="0" cellspacing="0" border="0">
     <tr>
         <td>
-            Sorry, no preview available<br>
+            {{ 'no_preview_available'|trans([], 'admin') }}<br>
             {% set tempFile = asset.getTemporaryFile() %}
             {% set dataUri = pimcore_asset_version_preview(tempFile) %}
 

diff --git a/translations/admin.en.yaml b/translations/admin.en.yaml
@@ -1026,4 +1026,5 @@ zip_upload_want_to_overwrite_yes_option: 'Yes'
 zip_upload_want_to_overwrite_no_option: 'No'
 invalid_option: 'Invalid Option field [ {field} ]: Please choose a valid option for select / multiselect field [ {field} ]. Current value: "{option}"'
 respect_timezone: 'Respect timezone'
-delete_quantity_value_unit_confirmation: 'Deleting this unit will impact all related elements that reference it. Are you sure you want to proceed?'
+delete_quantity_value_unit_confirmation: 'Deleting this unit will impact all related elements that reference it. Are you sure you want to proceed?'
+no_preview_available: 'Sorry, no preview available'