From c95f6e051208d9594fc78851a3d40e02005c044b Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 21 Jan 2021 16:12:43 -0700 Subject: [PATCH] #87 Adds joinMap object to merge operation --- Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs b/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs index e2756c5..16af795 100644 --- a/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs +++ b/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs @@ -108,6 +108,11 @@ namespace PepperDash.Core.Config else merged.Add("tieLines", new JArray()); + if (template["joinMaps"] != null) + merged.Add("joinMaps", template["joinMaps"]); + else + merged.Add("joinMaps", new JObject()); + if (system["global"] != null) merged.Add("global", Merge(template["global"], system["global"], "global")); else