From da48f8435a914cf809a05b0305c154d55715e5a3 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Date: Tue, 19 Oct 2021 13:30:03 +0200
Subject: [PATCH] Merge pull request #11360 from
 umbraco/v8/bugfix/11057-mandatory-image-not-validating-after-first-time-failure

Fixes 11057: Mandatory Image not validating after first time failure

(cherry picked from commit 5cc70d2160d2cb917d5d9983a715474619cb87e1)
---
 .../mediapicker3/umb-media-picker3-property-editor.html       | 4 ++++
 .../mediapicker3/umbMediaPicker3PropertyEditor.component.js   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
index daf9566e2d4d..f40c6bc437e5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
@@ -69,4 +69,8 @@
         <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.maxCount.errorMsg"></span>
     </div>
 
+    <ng-form name="vm.modelValueForm">
+        <input type="hidden" name="modelValue" ng-model="vm.model.value.length" ng-required="vm.model.validation.mandatory && vm.model.value.length === 0" />
+    </ng-form>
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
index 02b9f0b92813..ff0b0030e6b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
@@ -137,6 +137,10 @@
             if (vm.propertyForm) {
                 vm.propertyForm.$setDirty();
             }
+
+            if (vm.modelValueForm) {
+                vm.modelValueForm.modelValue.$setDirty();
+            }
         }
 
         function addMediaAt(createIndex, $event) {