From eda87cbbd21624a01b3f5024d55feaba0b62289d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 8 Oct 2018 10:48:57 +0200
Subject: [PATCH] prevent unpublish date to be before publish date and vice
 versa

---
 .../content/overlays/schedule.controller.js    | 18 +++++++++++++-----
 .../src/views/content/overlays/schedule.html   |  3 ++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
index 6f570be8a5..9b84bd5335 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
@@ -94,8 +94,14 @@
 
         }
 
-        function datePickerSetup(variant, datePickerInstance) {
-            variant.datePickerInstance = datePickerInstance;
+        function datePickerSetup(variant, type, datePickerInstance) {
+            // store a date picker instance for publish and unpublish picker
+            // so we can change the settings independently.
+            if (type === 'publish') {
+                variant.releaseDatePickerInstance = datePickerInstance;
+            } else if (type === 'unpublish') {
+                variant.removeDatePickerInstance = datePickerInstance;
+            }
         };
 
         function datePickerChange(variant, dateStr, type) {
@@ -132,9 +138,8 @@
             // make sure dates are formatted to the user's locale
             formatDatesToLocal(variant);
 
-            // store the first selected date so we can apply to other selected variants
-
-            // variant.datePickerInstance.set("maxDate", moment(variant.releaseDate).format("YYYY-MM-DD HH:mm"));
+            // make sure the unpublish date can't be before the publish date
+            variant.removeDatePickerInstance.set("minDate", moment(variant.releaseDate).format("YYYY-MM-DD HH:mm"));
 
         }
 
@@ -154,6 +159,9 @@
             // make sure dates are formatted to the user's locale
             formatDatesToLocal(variant);
 
+            // make sure the publish date can't be after the publish date
+            variant.releaseDatePickerInstance.set("maxDate", moment(variant.removeDate).format("YYYY-MM-DD HH:mm"));
+
         }
 
         function clearPublishDate(variant) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 665dc003f3..f6b374a95f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -18,7 +18,7 @@
                     <umb-flatpickr
                         ng-model="vm.variants[0].releaseDate"
                         options="vm.variants[0].datePickerConfig"
-                        on-setup="vm.datePickerSetup(vm.variants[0], fpItem)"
+                        on-setup="vm.datePickerSetup(vm.variants[0], 'publish', fpItem)"
                         on-change="vm.datePickerChange(vm.variants[0], dateStr, 'publish')"
                         on-open="vm.datePickerShow()"
                         on-close="vm.datePickerClose()">
@@ -51,6 +51,7 @@
                     <umb-flatpickr
                         ng-model="vm.variants[0].removeDate"
                         options="vm.variants[0].datePickerConfig"
+                        on-setup="vm.datePickerSetup(vm.variants[0], 'unpublish', fpItem)"
                         on-change="vm.datePickerChange(vm.variants[0], dateStr, 'unpublish')"
                         on-show="vm.datePickerShow()"
                         on-close="vm.datePickerClose()">