From d90ccbb7f0505f4660c9fa54bffd1ec3eab58de6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 9 May 2018 14:34:55 +1000
Subject: [PATCH] no matter what you can always publish the current variant

---
 .../components/content/edit.controller.js         | 13 +------------
 .../common/overlays/publish/publish.controller.js | 15 ++++-----------
 .../views/common/overlays/publish/publish.html    |  5 ++---
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml  |  1 -
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index e318860e25..6736d399bb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -318,18 +318,7 @@
             // TODO: Add "..." to publish button label if there are more than one variant to publish - currently it just adds the elipses if there's more than 1 variant
             if ($scope.content.variants.length > 1) {
                 //before we launch the dialog we want to execute all client side validations first
-                if (formHelper.submitForm({ scope: $scope, action: "publish", formCtrl: $scope.contentForm })) {
-
-                    //we need to check if the current form is dirty and if so we need to update the current variant's isEdited property to true
-                    //so that the publish dialog knows that it's a dirty culture and that it should be allowed to be published
-                    if ($scope.contentForm.$dirty) {
-                        _.each($scope.content.variants, function (d) {
-                            //set the isEdited flag if it's the current one
-                            if (d.current === true) {
-                                d.isEdited = true;
-                            }
-                        });
-                    }
+                if (formHelper.submitForm({ scope: $scope, action: "publish"})) {
 
                     var dialog = {
                         title: localizationService.localize("content_readyToPublish"),
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js
index 752636ab28..49b41328d2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.controller.js
@@ -9,7 +9,6 @@
         vm.loading = true;
         vm.dirtyVariantFilter = dirtyVariantFilter;
         vm.pristineVariantFilter = pristineVariantFilter;
-        vm.hasDirtyVariants = false;
         vm.hasPristineVariants = false;
 
         //watch this model, if it's reset, then re init
@@ -40,15 +39,14 @@
         }
 
         function dirtyVariantFilter(variant) {
-            return (variant.isEdited === true || (variant.isEdited === false && variant.state === "Unpublished"));
+            return (variant.current || variant.isEdited === true || (variant.isEdited === false && variant.state === "Unpublished"));
         }
 
         function pristineVariantFilter(variant) {
-            return !(variant.isEdited === true || (variant.isEdited === false && variant.state === "Unpublished"));
+            return !(dirtyVariantFilter(variant));
         }
 
         function onInit() {
-            vm.hasDirtyVariants = false;
             vm.hasPristineVariants = false;
 
             _.each(vm.variants,
@@ -56,13 +54,8 @@
                     variant.compositeId = variant.language.id + "_" + (variant.segment ? variant.segment : "");
                     variant.htmlId = "publish_variant_" + variant.compositeId;
 
-                    //check for dirty variants
-                    if (variant.isEdited === true || (variant.isEdited === false && variant.state === "Unpublished")) {
-                        vm.hasDirtyVariants = true;
-                    }
-                    else {
-                        vm.hasPristineVariants = true;
-                    }
+                    //check for pristine variants
+                    vm.hasPristineVariants = !(dirtyVariantFilter(variant));
                 });
 
             if (vm.variants.length !== 0) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.html
index 396ac9c8be..38a460801e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/publish/publish.html
@@ -1,15 +1,14 @@
 <div ng-controller="Umbraco.Overlays.PublishController as vm">
 
     <div style="margin-bottom: 15px;">
-        <p ng-if="vm.hasDirtyVariants"><localize key="content_languagesToPublish"></localize></p>
-        <p ng-if="!vm.hasDirtyVariants"><localize key="content_noLanguagesToPublish"></localize></p>
+        <p><localize key="content_languagesToPublish"></localize></p>
     </div>
 
     <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
         <umb-load-indicator></umb-load-indicator>
     </div>
 
-    <div class="umb-list umb-list--condensed" ng-if="!vm.loading && vm.hasDirtyVariants">
+    <div class="umb-list umb-list--condensed" ng-if="!vm.loading">
 
         <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter">
             <ng-form name="publishVariantSelectorForm">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index e2649a3ab7..a375631709 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -233,7 +233,6 @@
         <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
         <key alias="isSensitiveValue_short">This value is hidden.</key>
         <key alias="languagesToPublish">What languages would you like to publish?</key>
-        <key alias="noLanguagesToPublish">No languages available to be published.</key>
         <key alias="publishedLanguages">Published Languages.</key>
         <key alias="readyToPublish">Ready to Publish?</key>
     </area>