From 141893d6a745c9d9f685a951e7060cce0f0bbdcb Mon Sep 17 00:00:00 2001
From: Klaas Poortinga <poortinga.k@gmail.com>
Date: Mon, 30 Mar 2020 19:30:59 +0200
Subject: [PATCH] MediaFinder modifications (#5010)

---
 modules/backend/formwidgets/MediaFinder.php                 | 6 +++++-
 .../formwidgets/mediafinder/partials/_file_single.htm       | 1 +
 .../formwidgets/mediafinder/partials/_image_single.htm      | 1 +
 .../formwidgets/mediafinder/partials/_mediafinder.htm       | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
index 82a179694..0fb4799ec 100644
--- a/modules/backend/formwidgets/MediaFinder.php
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -66,7 +66,11 @@ class MediaFinder extends FormWidgetBase
 
         $user = BackendAuth::getUser();
 
-        if ($this->formField->disabled || !$user || !$user->hasAccess('media.manage_media')) {
+        if ($this->formField->disabled
+            || $this->formField->readOnly
+            || !$user
+            || !$user->hasAccess('media.manage_media')
+        ) {
             $this->previewMode = true;
         }
     }
diff --git a/modules/backend/formwidgets/mediafinder/partials/_file_single.htm b/modules/backend/formwidgets/mediafinder/partials/_file_single.htm
index 1de373847..d546c318b 100644
--- a/modules/backend/formwidgets/mediafinder/partials/_file_single.htm
+++ b/modules/backend/formwidgets/mediafinder/partials/_file_single.htm
@@ -2,6 +2,7 @@
     id="<?= $this->getId() ?>"
     class="field-mediafinder style-file-single <?= $value ? 'is-populated' : '' ?> <?= $this->previewMode ? 'is-preview' : '' ?>"
     data-control="mediafinder"
+    <?= $field->getAttributes() ?>
 >
 
     <!-- Find Button -->
diff --git a/modules/backend/formwidgets/mediafinder/partials/_image_single.htm b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
index 73c6b2973..a28e94bf1 100644
--- a/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
+++ b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
@@ -4,6 +4,7 @@
     data-control="mediafinder"
     data-thumbnail-width="<?= $imageWidth ?: '0' ?>"
     data-thumbnail-height="<?= $imageHeight ?: '0' ?>"
+    <?= $field->getAttributes() ?>
 >
 
     <!-- Find Button -->
diff --git a/modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm b/modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
index b4b703508..c0ed69441 100644
--- a/modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
+++ b/modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
@@ -1,6 +1,6 @@
 <?php if ($this->previewMode && !$value): ?>
 
-    <span class="form-control"><?= e(trans('backend::lang.form.preview_no_media_message')) ?></span>
+    <span class="form-control" disabled="disabled"><?= e(trans('backend::lang.form.preview_no_media_message')) ?></span>
 
 <?php else: ?>