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

Fixes some logic with validation

Browse Source
This commit is contained in:
Shannon
2018-11-13 16:57:38 +11:00
parent c6ef3750df
commit ac5c76385c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
View File

@@ -22,8 +22,9 @@
var published = !(variant.state === "NotCreated" || variant.state === "Draft");
if ((variant.language.isMandatory && !published) && (!publishable || !variant.publish)) {
//if a mandatory variant isn't published and it's not publishable or not selected to be published
//then we cannot publish anything
//if a mandatory variant isn't published
//and it's not publishable or not selected to be published
//then we cannot continue
//TODO: Show a message when this occurs
return false;

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

@@ -328,10 +328,13 @@
var published = !(variant.state === "NotCreated" || variant.state === "Draft");
var isScheduledPublished = variant.releaseDate;
if (isMandatory) {
if (!publishable || (!published && !isScheduledPublished)) {
return false;
}
if (isMandatory && !published && !isScheduledPublished && (!publishable || !variant.save)) {
//if a mandatory variant isn't published or scheduled published
//and it's not publishable or not selected to be published
//then we cannot continue
//TODO: Show a message when this occurs
return false;
}
if (variant.save && (variant.releaseDate || variant.expireDate)) {