pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-15 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

v1.0.13; clz builds; touchups

Browse Source
This commit is contained in:
Heath Volmer
2019-02-12 12:50:16 -07:00
parent 255095ee7f
commit e5efbdec5e
3 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
CLZ Builds/PepperDash_Core.clz
View File

Binary file not shown.

BIN
CLZ Builds/PepperDash_Core.dll
View File

Binary file not shown.

31
Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs
View File

@@ -181,37 +181,6 @@ namespace PepperDash.Core.Config
{ {
o1Value.Replace(MergeArraysOnTopLevelProperty(o1Value as JArray, o2Value as JArray, "key", propPath)); o1Value.Replace(MergeArraysOnTopLevelProperty(o1Value as JArray, o2Value as JArray, "key", propPath));
} }
//var o2Arr = o2Value as JArray;
//foreach (var o2Item in o2Arr.Values())
//{
// var key = o2Item["key"];
// // Bail out if there is no key property
// if (key == null)
// {
// Debug.Console(1, Debug.ErrorLogLevel.Warning, "Cannot merge array items for an array. 'Key' property is not present.");
// break; // stop looping array and bail
// }
// else
// {
// // find matching key in o1 array
// // merge item if found
// var o1Item = (o1Value as JArray).FirstOrDefault(i => i["key"] == key);
// if(o1Item == null)
// {
// Debug.Console(1, Debug.ErrorLogLevel.Warning, "Cannot merge array item with key '{0}'. Key is not present on template array", key);
// continue;
// }
// else if (o1Item.HasValues)
// {
// o1Item.Replace(Merge(o1Item, o2Item));
// }
// else // primitives
// {
// o1Item.Replace(o2Item);
// }
// }
//}
} }
else if (o2Prop.Value.HasValues && o1Value.HasValues) else if (o2Prop.Value.HasValues && o1Value.HasValues)
{ {