yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding missing nullchecks.

Browse Source
This commit is contained in:
Claus
2020-05-28 08:41:32 +02:00
parent 16a8a08df9
commit ff30a27697
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
View File

@@ -34,11 +34,11 @@ namespace Umbraco.Web.Compose
foreach (var cultureVal in propVals) foreach (var cultureVal in propVals)
{ {
// Remove keys from published value & any nested NC's // Remove keys from published value & any nested NC's
var updatedPublishedVal = CreateNewNestedContentKeys(cultureVal.PublishedValue.ToString()); var updatedPublishedVal = CreateNewNestedContentKeys(cultureVal.PublishedValue?.ToString());
cultureVal.PublishedValue = updatedPublishedVal; cultureVal.PublishedValue = updatedPublishedVal;
// Remove keys from edited/draft value & any nested NC's // Remove keys from edited/draft value & any nested NC's
var updatedEditedVal = CreateNewNestedContentKeys(cultureVal.EditedValue.ToString()); var updatedEditedVal = CreateNewNestedContentKeys(cultureVal.EditedValue?.ToString());
cultureVal.EditedValue = updatedEditedVal; cultureVal.EditedValue = updatedEditedVal;
} }
} }
@@ -61,11 +61,11 @@ namespace Umbraco.Web.Compose
foreach (var cultureVal in propVals) foreach (var cultureVal in propVals)
{ {
// Remove keys from published value & any nested NC's // Remove keys from published value & any nested NC's
var updatedPublishedVal = CreateMissingNestedContentKeys(cultureVal.PublishedValue.ToString()); var updatedPublishedVal = CreateMissingNestedContentKeys(cultureVal.PublishedValue?.ToString());
cultureVal.PublishedValue = updatedPublishedVal; cultureVal.PublishedValue = updatedPublishedVal;
// Remove keys from edited/draft value & any nested NC's // Remove keys from edited/draft value & any nested NC's
var updatedEditedVal = CreateMissingNestedContentKeys(cultureVal.EditedValue.ToString()); var updatedEditedVal = CreateMissingNestedContentKeys(cultureVal.EditedValue?.ToString());
cultureVal.EditedValue = updatedEditedVal; cultureVal.EditedValue = updatedEditedVal;
} }
} }
@@ -89,11 +89,11 @@ namespace Umbraco.Web.Compose
foreach (var cultureVal in propVals) foreach (var cultureVal in propVals)
{ {
// Remove keys from published value & any nested NC's // Remove keys from published value & any nested NC's
var updatedPublishedVal = CreateMissingNestedContentKeys(cultureVal.PublishedValue.ToString()); var updatedPublishedVal = CreateMissingNestedContentKeys(cultureVal.PublishedValue?.ToString());
cultureVal.PublishedValue = updatedPublishedVal; cultureVal.PublishedValue = updatedPublishedVal;
// Remove keys from edited/draft value & any nested NC's // Remove keys from edited/draft value & any nested NC's
var updatedEditedVal = CreateMissingNestedContentKeys(cultureVal.EditedValue.ToString()); var updatedEditedVal = CreateMissingNestedContentKeys(cultureVal.EditedValue?.ToString());
cultureVal.EditedValue = updatedEditedVal; cultureVal.EditedValue = updatedEditedVal;
} }
} }
@@ -109,6 +109,9 @@ namespace Umbraco.Web.Compose
private string CreateNewNestedContentKeys(string ncJson) private string CreateNewNestedContentKeys(string ncJson)
{ {
if (string.IsNullOrWhiteSpace(ncJson))
return ncJson;
// Try & convert JSON to JArray (two props we will know should exist are key & ncContentTypeAlias) // Try & convert JSON to JArray (two props we will know should exist are key & ncContentTypeAlias)
var ncItems = JArray.Parse(ncJson); var ncItems = JArray.Parse(ncJson);
@@ -140,6 +143,9 @@ namespace Umbraco.Web.Compose
private string CreateMissingNestedContentKeys(string ncJson) private string CreateMissingNestedContentKeys(string ncJson)
{ {
if (string.IsNullOrWhiteSpace(ncJson))
return ncJson;
// Try & convert JSON to JArray (two props we will know should exist are key & ncContentTypeAlias) // Try & convert JSON to JArray (two props we will know should exist are key & ncContentTypeAlias)
var ncItems = JArray.Parse(ncJson); var ncItems = JArray.Parse(ncJson);