yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent unpublish date to be before publish date and vice versa

Browse Source
This commit is contained in:
Mads Rasmussen
2018-10-08 10:48:57 +02:00
parent a629f8fb83
commit eda87cbbd2
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
View File

@@ -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) {

3
src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
View File

@@ -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()">