From 41a634bb2bab68490961d2fe3417a2097dee2ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C5=BEe=20=C4=8Casar?= <acasar@users.noreply.github.com>
Date: Thu, 18 Apr 2019 02:54:43 +0200
Subject: [PATCH] Fix mediafinder error message (#4269)

Related: https://github.com/octobercms/october/commit/65936513313d5cbd2bdcd7893043c926aecd7108
---
 .../mediafinder/assets/js/mediafinder.js        |  1 +
 .../mediafinder/partials/_image_single.htm      | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js b/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
index f46d13bfc..eb6cc9bbf 100644
--- a/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
+++ b/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
@@ -117,6 +117,7 @@
 
                 if (self.options.isImage) {
                     $('[data-find-image]', self.$el).attr('src', publicUrl)
+                    $('[data-find-error]', self.$el).hide()
                 }
 
                 self.evalIsPopulated()
diff --git a/modules/backend/formwidgets/mediafinder/partials/_image_single.htm b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
index f2b60dd7d..b17a46e96 100644
--- a/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
+++ b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
@@ -13,13 +13,16 @@
 
     <!-- Existing value -->
     <div class="find-object">
-        <?php if ($imageExists): ?>
-            <div class="icon-container">
-                <img data-find-image src="<?= $imageUrl ?>" alt="" />
-            </div>
-        <?php else: ?>
-            <p class="help-block"><?= e(trans('backend::lang.mediafinder.no_image')) ?></p>
-        <?php endif ?>
+        <div class="icon-container">
+            <img data-find-image src="<?= $imageUrl ?>" alt="" />
+        </div>
+
+        <?php if (!$imageExists && !empty($imageUrl)) : ?>
+            <p data-find-error class="help-block">
+                <?= e(trans('backend::lang.mediafinder.no_image')) ?>
+            </p>
+        <?php endif; ?>
+
         <div class="info">
             <h4 class="filename">
                 <span data-find-file-name><?= ltrim($value, '/') ?></span>