diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js index d17b9bc3fb..9fcd81b2ed 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js @@ -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; 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 bc1bd80baf..6991a7b509 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 @@ -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)) {