From 9bce66cb5fc517cfad133153f70632dcd1187c96 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 29 Apr 2020 15:29:21 +0100
Subject: [PATCH] Adds AllowSegmentVariation on the Doctype to be peristed

---
 src/Umbraco.Web/Editors/BackOfficeServerVariables.cs       | 2 +-
 src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs   | 3 +++
 src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 53865830d8..27d6ff236f 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -349,7 +349,7 @@ namespace Umbraco.Web.Editors
                         {"loginBackgroundImage",  Current.Configs.Settings().Content.LoginBackgroundImage},
                         {"showUserInvite", EmailSender.CanSendRequiredEmail},
                         {"canSendRequiredEmail", EmailSender.CanSendRequiredEmail},
-                        {"showAllowSegmentationForDocumentTypes", false},
+                        {"showAllowSegmentationForDocumentTypes", true},
                     }
                 },
                 {
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
index b1d24c5fd2..a93be56846 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeSave.cs
@@ -69,6 +69,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "allowCultureVariant")]
         public bool AllowCultureVariant { get; set; }
 
+        [DataMember(Name = "allowSegmentVariant")]
+        public bool AllowSegmentVariant { get; set; }
+
         //Tabs
         [DataMember(Name = "groups")]
         public IEnumerable<PropertyGroupBasic<TPropertyType>> Groups { get; set; }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
index fefef5e2d7..c767e9aaf3 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
@@ -403,6 +403,7 @@ namespace Umbraco.Web.Models.Mapping
             if (!(target is IMemberType))
             {
                 target.SetVariesBy(ContentVariation.Culture, source.AllowCultureVariant);
+                target.SetVariesBy(ContentVariation.Segment, source.AllowSegmentVariant);
             }
 
             // handle property groups and property types