From 813998a614c89dbcd9d11e6019aad535cd18009e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Knippers?= <daniel.knippers@perplex.nl>
Date: Fri, 11 Oct 2019 14:13:49 +0200
Subject: [PATCH] Support for saving edited segment values

---
 .../Editors/Binders/ContentItemBinder.cs      |  9 +++++---
 src/Umbraco.Web/Editors/ContentController.cs  | 23 +++++++++++++++----
 .../ContentEditing/ContentVariantSave.cs      |  6 +++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs b/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
index 11a876345d..d9d56c584f 100644
--- a/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Editors.Binders
             {
                 foreach (var variant in model.Variants)
                 {
-                    if (variant.Culture.IsNullOrWhiteSpace())
+                    if (variant.Culture.IsNullOrWhiteSpace() && variant.Segment.IsNullOrWhiteSpace())
                     {
                         //map the property dto collection (no culture is passed to the mapping context so it will be invariant)
                         variant.PropertyCollectionDto = Current.Mapper.Map<ContentPropertyCollectionDto>(model.PersistedContent);
@@ -59,7 +59,11 @@ namespace Umbraco.Web.Editors.Binders
                         //map the property dto collection with the culture of the current variant
                         variant.PropertyCollectionDto = Current.Mapper.Map<ContentPropertyCollectionDto>(
                             model.PersistedContent,
-                            context => context.SetCulture(variant.Culture));
+                            context =>
+                            {
+                                context.SetCulture(variant.Culture);
+                                context.SetSegment(variant.Segment);
+                            });
                     }
 
                     //now map all of the saved values to the dto
@@ -87,6 +91,5 @@ namespace Umbraco.Web.Editors.Binders
                 model.ParentId,
                 contentType);
         }
-        
     }
 }
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 9d5af028e3..bc2b55833e 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1836,8 +1836,13 @@ namespace Umbraco.Web.Editors
         /// <param name="contentSave"></param>
         private void MapValuesForPersistence(ContentItemSave contentSave)
         {
-            // inline method to determine if a property type varies
-            bool Varies(Property property) => property.PropertyType.VariesByCulture();
+            // inline method to determine the culture and segment to persist the property
+            (string culture, string segment) PropertyCultureAndSegment(Property property, ContentVariantSave variant)
+            {
+                var culture = property.PropertyType.VariesByCulture() ? variant.Culture : null;
+                var segment = property.PropertyType.VariesBySegment() ? variant.Segment : null;
+                return (culture, segment);
+            }            
 
             var variantIndex = 0;
 
@@ -1876,8 +1881,18 @@ namespace Umbraco.Web.Editors
                 MapPropertyValuesForPersistence<IContent, ContentItemSave>(
                     contentSave,
                     propertyCollection,
-                    (save, property) => Varies(property) ? property.GetValue(variant.Culture) : property.GetValue(),         //get prop val
-                    (save, property, v) => { if (Varies(property)) property.SetValue(v, variant.Culture); else property.SetValue(v); },  //set prop val
+                    (save, property) =>
+                    {
+                        // Get property value
+                        (var culture, var segment) = PropertyCultureAndSegment(property, variant);                        
+                        return property.GetValue(culture, segment);                        
+                    },
+                    (save, property, v) =>
+                    {
+                        // Set property value
+                        (var culture, var segment) = PropertyCultureAndSegment(property, variant);
+                        property.SetValue(v, culture, segment);                        
+                    },  
                     variant.Culture);
 
                 variantIndex++;
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentVariantSave.cs b/src/Umbraco.Web/Models/ContentEditing/ContentVariantSave.cs
index deadac949a..9a7555ad92 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentVariantSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentVariantSave.cs
@@ -29,6 +29,12 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "culture")]
         public string Culture { get; set; }
 
+        /// <summary>
+        /// The segment of this variant, if this is invariant than this is null or empty
+        /// </summary>
+        [DataMember(Name = "segment")]
+        public string Segment { get; set; }
+
         /// <summary>
         /// Indicates if the variant should be updated
         /// </summary>