diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 0fe05f385f..9391b7442f 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -88,8 +88,8 @@ namespace Umbraco.Tests.Services
private void AssertJsonStartsWith(int id, string expected)
{
var json = GetJson(id).Replace('"', '\'');
- var pos = json.IndexOf("'cultureData':", StringComparison.InvariantCultureIgnoreCase);
- json = json.Substring(0, pos + "'cultureData':".Length);
+ var pos = json.IndexOf("'cd':", StringComparison.InvariantCultureIgnoreCase);
+ json = json.Substring(0, pos + "'cd':".Length);
Assert.AreEqual(expected, json);
}
@@ -595,7 +595,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
// switch content type to Nothing
contentType.Variations = ContentVariation.Nothing;
@@ -612,7 +612,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'','seg':'','val':'v1en'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
// switch content back to Culture
contentType.Variations = ContentVariation.Culture;
@@ -629,7 +629,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'','seg':'','val':'v1en'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
// switch property back to Culture
contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
@@ -645,7 +645,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
}
[Test]
@@ -686,7 +686,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
// switch content type to Culture
contentType.Variations = ContentVariation.Culture;
@@ -702,7 +702,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
// switch property to Culture
contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
@@ -717,7 +717,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'c':'en','v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
// switch content back to Nothing
contentType.Variations = ContentVariation.Nothing;
@@ -734,7 +734,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
}
[Test]
@@ -772,7 +772,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
// switch property type to Nothing
contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
@@ -789,7 +789,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'','seg':'','val':'v1en'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
// switch property back to Culture
contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
@@ -805,7 +805,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
// switch other property to Culture
contentType.PropertyTypes.First(x => x.Alias == "value2").Variations = ContentVariation.Culture;
@@ -823,7 +823,7 @@ namespace Umbraco.Tests.Services
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'en','seg':'','val':'v2'}]},'cultureData':");
+ "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'c':'en','v':'v2'}]},'cd':");
}
[TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
@@ -1054,7 +1054,7 @@ namespace Umbraco.Tests.Services
// both value11 and value21 are variant
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
composed.Variations = ContentVariation.Nothing;
ServiceContext.ContentTypeService.Save(composed);
@@ -1062,7 +1062,7 @@ namespace Umbraco.Tests.Services
// both value11 and value21 are invariant
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11en'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'','seg':'','val':'v21en'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
composed.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composed);
@@ -1070,7 +1070,7 @@ namespace Umbraco.Tests.Services
// value11 is variant again, but value21 is still invariant
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'','seg':'','val':'v21en'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
composed.PropertyTypes.First(x => x.Alias == "value21").Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composed);
@@ -1078,7 +1078,7 @@ namespace Umbraco.Tests.Services
// we can make it variant again
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
composing.Variations = ContentVariation.Nothing;
ServiceContext.ContentTypeService.Save(composing);
@@ -1086,7 +1086,7 @@ namespace Umbraco.Tests.Services
// value11 is invariant
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11en'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
composing.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composing);
@@ -1094,7 +1094,7 @@ namespace Umbraco.Tests.Services
// value11 is still invariant
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11en'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
composing.PropertyTypes.First(x => x.Alias == "value11").Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composing);
@@ -1102,7 +1102,7 @@ namespace Umbraco.Tests.Services
// we can make it variant again
Console.WriteLine(GetJson(document.Id));
AssertJsonStartsWith(document.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
}
[Test]
@@ -1167,11 +1167,11 @@ namespace Umbraco.Tests.Services
// both value11 and value21 are variant
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
composed1.Variations = ContentVariation.Nothing;
ServiceContext.ContentTypeService.Save(composed1);
@@ -1179,11 +1179,11 @@ namespace Umbraco.Tests.Services
// both value11 and value21 are invariant
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11en'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'','seg':'','val':'v21en'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
composed1.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composed1);
@@ -1191,11 +1191,11 @@ namespace Umbraco.Tests.Services
// value11 is variant again, but value21 is still invariant
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'','seg':'','val':'v21en'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
composed1.PropertyTypes.First(x => x.Alias == "value21").Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composed1);
@@ -1203,11 +1203,11 @@ namespace Umbraco.Tests.Services
// we can make it variant again
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
composing.Variations = ContentVariation.Nothing;
ServiceContext.ContentTypeService.Save(composing);
@@ -1215,11 +1215,11 @@ namespace Umbraco.Tests.Services
// value11 is invariant
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11en'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
composing.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composing);
@@ -1227,11 +1227,11 @@ namespace Umbraco.Tests.Services
// value11 is still invariant
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11en'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
composing.PropertyTypes.First(x => x.Alias == "value11").Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(composing);
@@ -1239,11 +1239,11 @@ namespace Umbraco.Tests.Services
// we can make it variant again
Console.WriteLine(GetJson(document1.Id));
AssertJsonStartsWith(document1.Id,
- "{'properties':{'value11':[{'culture':'en','seg':'','val':'v11en'},{'culture':'fr','seg':'','val':'v11fr'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value21':[{'culture':'en','seg':'','val':'v21en'},{'culture':'fr','seg':'','val':'v21fr'}],'value22':[{'culture':'','seg':'','val':'v22'}]},'cultureData':");
+ "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
Console.WriteLine(GetJson(document2.Id));
AssertJsonStartsWith(document2.Id,
- "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
+ "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
}
private void CreateFrenchAndEnglishLangs()
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
index 19a33a8351..8d223e427e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
@@ -12,9 +12,9 @@
prepareEntryForStorage(data));
+ var copiedDatas = datas.map(data => prepareEntryForStorage(data, firstLevelClearupMethod));
// remove previous copies of this entry:
storage.entries = storage.entries.filter(
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
index 96636a3096..6238900bf6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
@@ -32,14 +32,18 @@
.umb-lightbox__close {
position: absolute;
top: 20px;
- right: 60px;
+ right: 20px;
+ height: 40px;
+ width: 40px;
}
.umb-lightbox__close i {
font-size: 20px;
- cursor: pointer;
- height: 40px;
- width: 40px;
+ height: inherit;
+ width: inherit;
+ position: absolute;
+ top: 0;
+ left: 0;
}
.umb-lightbox__images {
@@ -75,12 +79,20 @@
right: 20px;
top: 50%;
transform: translate(0, -50%);
+
+ .umb-lightbox__control-icon {
+ margin-right: -4px;
+ }
}
.umb-lightbox__control.-prev {
left: 20px;
top: 50%;
transform: translate(0, -50%);
+
+ .umb-lightbox__control-icon {
+ margin-left: -4px;
+ }
}
.umb-lightbox__control-icon {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
index 769cd422ef..872fdbe41f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
@@ -7,18 +7,19 @@
-
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
index c6675ccec8..0499bea713 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
@@ -9,7 +9,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 7cad5a5f05..066cbd6c17 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -1,6 +1,58 @@
(function () {
'use strict';
+ /**
+ * When performing a copy, we do copy the ElementType Data Model, but each inner Nested Content property is still stored as the Nested Content Model, aka. each property is just storing its value. To handle this we need to ensure we handle both scenarios.
+ */
+
+
+ angular.module('umbraco').run(['clipboardService', function (clipboardService) {
+
+ function clearNestedContentPropertiesForStorage(prop, propClearingMethod) {
+
+ // if prop.editor is "Umbraco.NestedContent"
+ if ((typeof prop === 'object' && prop.editor === "Umbraco.NestedContent")) {
+
+ var value = prop.value;
+ for (var i = 0; i < value.length; i++) {
+ var obj = value[i];
+
+ // remove the key
+ delete obj.key;
+
+ // Loop through all inner properties:
+ for (var k in obj) {
+ propClearingMethod(obj[k]);
+ }
+ }
+ }
+ }
+
+ clipboardService.registrerClearPropertyResolver(clearNestedContentPropertiesForStorage)
+
+
+ function clearInnerNestedContentPropertiesForStorage(prop, propClearingMethod) {
+
+ // if we got an array, and it has a entry with ncContentTypeAlias this meants that we are dealing with a NestedContent property inside a NestedContent property.
+ if ((Array.isArray(prop) && prop.length > 0 && prop[0].ncContentTypeAlias !== undefined)) {
+
+ for (var i = 0; i < prop.length; i++) {
+ var obj = prop[i];
+
+ // remove the key
+ delete obj.key;
+
+ // Loop through all inner properties:
+ for (var k in obj) {
+ propClearingMethod(obj[k]);
+ }
+ }
+ }
+ }
+
+ clipboardService.registrerClearPropertyResolver(clearInnerNestedContentPropertiesForStorage)
+ }]);
+
angular
.module('umbraco')
.component('nestedContentPropertyEditor', {
@@ -13,7 +65,7 @@
}
});
- function NestedContentController($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService, $routeParams, editorState) {
+ function NestedContentController($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService) {
var vm = this;
var model = $scope.$parent.$parent.model;
@@ -76,7 +128,7 @@
}
localizationService.localize("clipboard_labelForArrayOfItemsFrom", [model.label, nodeName]).then(function (data) {
- clipboardService.copyArray("elementTypeArray", aliases, vm.nodes, data, "icon-thumbnail-list", model.id);
+ clipboardService.copyArray("elementTypeArray", aliases, vm.nodes, data, "icon-thumbnail-list", model.id, clearNodeForCopy);
});
}
@@ -385,6 +437,11 @@
});
}
+ function clearNodeForCopy(clonedData) {
+ delete clonedData.key;
+ delete clonedData.$$hashKey;
+ }
+
vm.showCopy = clipboardService.isSupported();
vm.showPaste = false;
@@ -392,7 +449,7 @@
syncCurrentNode();
- clipboardService.copy("elementType", node.contentTypeAlias, node);
+ clipboardService.copy("elementType", node.contentTypeAlias, node, null, null, null, clearNodeForCopy);
$event.stopPropagation();
}
diff --git a/src/Umbraco.Web.UI.Client/test/config/app.unit.js b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
index 1f49d237e6..9e265215dd 100644
--- a/src/Umbraco.Web.UI.Client/test/config/app.unit.js
+++ b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
@@ -13,8 +13,8 @@ var app = angular.module('umbraco', [
'ngSanitize',
//'ngMessages',
- 'tmh.dynamicLocale'
+ 'tmh.dynamicLocale',
//'ngFileUpload',
- //'LocalStorageModule',
+ 'LocalStorageModule'
//'chart.js'
]);
diff --git a/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs b/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
new file mode 100644
index 0000000000..5794a2734e
--- /dev/null
+++ b/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+using Umbraco.Web.PropertyEditors;
+
+namespace Umbraco.Web.Compose
+{
+ public class NestedContentPropertyComponent : IComponent
+ {
+ public void Initialize()
+ {
+ ContentService.Copying += ContentService_Copying;
+ ContentService.Saving += ContentService_Saving;
+ }
+
+ private void ContentService_Copying(IContentService sender, CopyEventArgs e)
+ {
+ // When a content node contains nested content property
+ // Check if the copied node contains a nested content
+ var nestedContentProps = e.Copy.Properties.Where(x => x.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.NestedContent);
+ UpdateNestedContentProperties(nestedContentProps, false);
+ }
+
+ private void ContentService_Saving(IContentService sender, ContentSavingEventArgs e)
+ {
+ // One or more content nodes could be saved in a bulk publish
+ foreach (var entity in e.SavedEntities)
+ {
+ // When a content node contains nested content property
+ // Check if the copied node contains a nested content
+ var nestedContentProps = entity.Properties.Where(x => x.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.NestedContent);
+ UpdateNestedContentProperties(nestedContentProps, true);
+ }
+ }
+
+ public void Terminate()
+ {
+ ContentService.Copying -= ContentService_Copying;
+ ContentService.Saving -= ContentService_Saving;
+ }
+
+ private void UpdateNestedContentProperties(IEnumerable nestedContentProps, bool onlyMissingKeys)
+ {
+ // Each NC Property on a doctype
+ foreach (var nestedContentProp in nestedContentProps)
+ {
+ // A NC Prop may have one or more values due to cultures
+ var propVals = nestedContentProp.Values;
+ foreach (var cultureVal in propVals)
+ {
+ // Remove keys from published value & any nested NC's
+ var updatedPublishedVal = CreateNestedContentKeys(cultureVal.PublishedValue?.ToString(), onlyMissingKeys);
+ cultureVal.PublishedValue = updatedPublishedVal;
+
+ // Remove keys from edited/draft value & any nested NC's
+ var updatedEditedVal = CreateNestedContentKeys(cultureVal.EditedValue?.ToString(), onlyMissingKeys);
+ cultureVal.EditedValue = updatedEditedVal;
+ }
+ }
+ }
+
+
+ // internal for tests
+ internal string CreateNestedContentKeys(string rawJson, bool onlyMissingKeys, Func createGuid = null)
+ {
+ // used so we can test nicely
+ if (createGuid == null)
+ createGuid = () => Guid.NewGuid();
+
+ if (string.IsNullOrWhiteSpace(rawJson) || !rawJson.DetectIsJson())
+ return rawJson;
+
+ // Parse JSON
+ var complexEditorValue = JToken.Parse(rawJson);
+
+ UpdateNestedContentKeysRecursively(complexEditorValue, onlyMissingKeys, createGuid);
+
+ return complexEditorValue.ToString();
+ }
+
+ private void UpdateNestedContentKeysRecursively(JToken json, bool onlyMissingKeys, Func createGuid)
+ {
+ // check if this is NC
+ var isNestedContent = json.SelectTokens($"$..['{NestedContentPropertyEditor.ContentTypeAliasPropertyKey}']", false).Any();
+
+ // select all values (flatten)
+ var allProperties = json.SelectTokens("$..*").OfType().Select(x => x.Parent as JProperty).WhereNotNull().ToList();
+ foreach (var prop in allProperties)
+ {
+ if (prop.Name == NestedContentPropertyEditor.ContentTypeAliasPropertyKey)
+ {
+ // get it's sibling 'key' property
+ var ncKeyVal = prop.Parent["key"] as JValue;
+ // TODO: This bool seems odd, if the key is null, shouldn't we fill it in regardless of onlyMissingKeys?
+ if ((onlyMissingKeys && ncKeyVal == null) || (!onlyMissingKeys && ncKeyVal != null))
+ {
+ // create or replace
+ prop.Parent["key"] = createGuid().ToString();
+ }
+ }
+ else if (!isNestedContent || prop.Name != "key")
+ {
+ // this is an arbitrary property that could contain a nested complex editor
+ var propVal = prop.Value?.ToString();
+ // check if this might contain a nested NC
+ if (!propVal.IsNullOrWhiteSpace() && propVal.DetectIsJson() && propVal.InvariantContains(NestedContentPropertyEditor.ContentTypeAliasPropertyKey))
+ {
+ // recurse
+ var parsed = JToken.Parse(propVal);
+ UpdateNestedContentKeysRecursively(parsed, onlyMissingKeys, createGuid);
+ // set the value to the updated one
+ prop.Value = parsed.ToString();
+ }
+ }
+ }
+ }
+
+ }
+}
diff --git a/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs b/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs
new file mode 100644
index 0000000000..4c9d9dee1c
--- /dev/null
+++ b/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Compose
+{
+ [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
+ public class NestedContentPropertyComposer : ComponentComposer, ICoreComposer
+ { }
+}
diff --git a/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs b/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs
index 07a3f2a5e3..eb39cb8faa 100644
--- a/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs
+++ b/src/Umbraco.Web/Mvc/ControllerFactoryExtensions.cs
@@ -25,7 +25,10 @@ namespace Umbraco.Web.Mvc
//we have no choice but to instantiate the controller
var instance = factory.CreateController(requestContext, controllerName);
- return instance?.GetType();
+ var controllerType = instance?.GetType();
+ factory.ReleaseController(instance);
+
+ return controllerType;
}
}
}
diff --git a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
index 6d2f1ce501..79d0a9aa63 100644
--- a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
@@ -81,7 +81,10 @@ namespace Umbraco.Web.Mvc
//we have no choice but to instantiate the controller
var instance = factory.CreateController(requestContext, controllerName);
- return instance?.GetType();
+ var controllerType = instance?.GetType();
+ factory.ReleaseController(instance);
+
+ return controllerType;
}
return GetControllerType(requestContext, controllerName);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
index adff28a2ba..ec5424ad9a 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
@@ -9,15 +9,28 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
///
internal class ContentNestedData
{
- [JsonProperty("properties")]
+ //dont serialize empty properties
+ [JsonProperty("pd")]
[JsonConverter(typeof(CaseInsensitiveDictionaryConverter))]
public Dictionary PropertyData { get; set; }
- [JsonProperty("cultureData")]
+ [JsonProperty("cd")]
[JsonConverter(typeof(CaseInsensitiveDictionaryConverter))]
public Dictionary CultureData { get; set; }
- [JsonProperty("urlSegment")]
+ [JsonProperty("us")]
public string UrlSegment { get; set; }
+
+ //Legacy properties used to deserialize existing nucache db entries
+ [JsonProperty("properties")]
+ [JsonConverter(typeof(CaseInsensitiveDictionaryConverter))]
+ private Dictionary LegacyPropertyData { set { PropertyData = value; } }
+
+ [JsonProperty("cultureData")]
+ [JsonConverter(typeof(CaseInsensitiveDictionaryConverter))]
+ private Dictionary LegacyCultureData { set { CultureData = value; } }
+
+ [JsonProperty("urlSegment")]
+ private string LegacyUrlSegment { set { UrlSegment = value; } }
}
}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
index a98a96f424..57ffbba34e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
@@ -8,16 +8,29 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
///
internal class CultureVariation
{
- [JsonProperty("name")]
+ [JsonProperty("nm")]
public string Name { get; set; }
- [JsonProperty("urlSegment")]
+ [JsonProperty("us")]
public string UrlSegment { get; set; }
- [JsonProperty("date")]
+ [JsonProperty("dt")]
public DateTime Date { get; set; }
- [JsonProperty("isDraft")]
+ [JsonProperty("isd")]
public bool IsDraft { get; set; }
+
+ //Legacy properties used to deserialize existing nucache db entries
+ [JsonProperty("name")]
+ private string LegacyName { set { Name = value; } }
+
+ [JsonProperty("urlSegment")]
+ private string LegacyUrlSegment { set { UrlSegment = value; } }
+
+ [JsonProperty("date")]
+ private DateTime LegacyDate { set { Date = value; } }
+
+ [JsonProperty("isDraft")]
+ private bool LegacyIsDraft { set { IsDraft = value; } }
}
}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
index e14426a2e2..4abcbc7e6f 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
@@ -1,4 +1,5 @@
using System;
+using System.ComponentModel;
using Newtonsoft.Json;
namespace Umbraco.Web.PublishedCache.NuCache.DataSource
@@ -8,21 +9,43 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
private string _culture;
private string _segment;
- [JsonProperty("culture")]
+ [DefaultValue("")]
+ [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate, PropertyName = "c")]
public string Culture
{
get => _culture;
set => _culture = value ?? throw new ArgumentNullException(nameof(value)); // TODO: or fallback to string.Empty? CANNOT be null
}
- [JsonProperty("seg")]
+ [DefaultValue("")]
+ [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate, PropertyName = "s")]
public string Segment
{
get => _segment;
set => _segment = value ?? throw new ArgumentNullException(nameof(value)); // TODO: or fallback to string.Empty? CANNOT be null
}
- [JsonProperty("val")]
+ [JsonProperty("v")]
public object Value { get; set; }
+
+
+ //Legacy properties used to deserialize existing nucache db entries
+ [JsonProperty("culture")]
+ private string LegacyCulture
+ {
+ set => Culture = value;
+ }
+
+ [JsonProperty("seg")]
+ private string LegacySegment
+ {
+ set => Segment = value;
+ }
+
+ [JsonProperty("val")]
+ private object LegacyValue
+ {
+ set => Value = value;
+ }
}
}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0cdbbaa984..1fb37322dd 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -130,6 +130,7 @@
+
@@ -243,6 +244,7 @@
+