From 10d0c79c1ddc78ccab9bef919488f71bcf93fd9d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 10 Jan 2019 14:28:22 +0100
Subject: [PATCH] #3642 - also save all languages with content on publish

---
 .../content/overlays/publish.controller.js    | 51 +++++++++++++++++--
 .../src/views/content/overlays/publish.html   |  4 +-
 .../Umbraco/config/lang/en_us.xml             |  1 +
 3 files changed, 50 insertions(+), 6 deletions(-)

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 9fcd81b2ed..9074834ee6 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
@@ -6,11 +6,12 @@
         var vm = this;
         vm.loading = true;
         vm.hasPristineVariants = false;
+        vm.isNew = true;
 
         vm.changeSelection = changeSelection;
         vm.dirtyVariantFilter = dirtyVariantFilter;
         vm.pristineVariantFilter = pristineVariantFilter;
-        
+
         /** Returns true if publishing is possible based on if there are un-published mandatory languages */
         function canPublish() {
             var selected = [];
@@ -22,7 +23,7 @@
                 var published = !(variant.state === "NotCreated" || variant.state === "Draft");
 
                 if ((variant.language.isMandatory && !published) && (!publishable || !variant.publish)) {
-                    //if a mandatory variant isn't published 
+                    //if a mandatory variant isn't published
                     //and it's not publishable or not selected to be published
                     //then we cannot continue
 
@@ -53,12 +54,35 @@
             return (variant.active || variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges" || variant.state === "NotCreated");
         }
 
+        function hasAnyData(variant) {
+            var result = variant.isDirty != null || (variant.name != null && variant.name.length > 0);
+
+            if(result) return true;
+
+            for (var t=0; t < variant.tabs.length; t++){
+                for (var p=0; p < variant.tabs[t].properties.length; p++){
+
+                    var property = variant.tabs[t].properties[p];
+
+                    if(property.culture == null) continue;
+
+                    result = result ||  (property.value != null && property.value.length > 0);
+
+                    if(result) return true;
+                }
+            }
+
+            return result;
+        }
+
         function pristineVariantFilter(variant) {
             return !(dirtyVariantFilter(variant));
         }
 
         function onInit() {
 
+
+
             vm.variants = $scope.model.variants;
 
             if (!$scope.model.title) {
@@ -69,6 +93,13 @@
 
             vm.hasPristineVariants = false;
 
+            _.each(vm.variants,
+                function (variant) {
+                    if(variant.state !== "NotCreated"){
+                        vm.isNew = false;
+                    }
+                });
+
             _.each(vm.variants,
                 function (variant) {
                     variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
@@ -78,6 +109,10 @@
                     if (!vm.hasPristineVariants) {
                         vm.hasPristineVariants = pristineVariantFilter(variant);
                     }
+
+                    if(vm.isNew && hasAnyData(variant)){
+                        variant.save = true;
+                    }
                 });
 
             if (vm.variants.length !== 0) {
@@ -103,8 +138,16 @@
                 $scope.model.disableSubmitButton = true;
             }
 
-            vm.loading = false;
-            
+            var labelKey =  vm.isNew ? "content_languagesToPublishForFirstTime" : "content_languagesToPublish";
+
+            localizationService.localize(labelKey).then(function (value) {
+                vm.headline = value;
+
+                vm.loading = false;
+            });
+
+
+
         }
 
         onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 8ca8b78b23..b33b7ccbfc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -1,7 +1,7 @@
 <div ng-controller="Umbraco.Overlays.PublishController as vm">
 
     <div style="margin-bottom: 15px;">
-        <p><localize key="content_languagesToPublish"></localize></p>
+        <p>{{vm.headline}}</p>
     </div>
 
     <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
@@ -65,7 +65,7 @@
                 <div ng-repeat="notification in variant.notifications">
                     <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
                 </div>
-                
+
             </div>
         </div>
     </div>
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 07ec0c9909..eaa1c6c39e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -270,6 +270,7 @@
     <key alias="includeUnpublished">Include drafts: also publish unpublished content items.</key>
     <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="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
     <key alias="languagesToPublish">What languages would you like to publish?</key>
     <key alias="languagesToSave">What languages would you like to save?</key>
     <key alias="languagesToSaveForFirstTime">All languages with content are saved on creation!</key>