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

Merge pull request #88 from PepperDash/hotfix/add-joinmap-object-to-merge

Browse source 
#87 Adds joinMap object to merge operation
This commit is contained in:
Andrew Welker 2021-01-21 16:50:41 -07:00 • committed by GitHub
commit 1e295bd45c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs
View file

@ -108,6 +108,11 @@ namespace PepperDash.Core.Config
else else
merged.Add("tieLines", new JArray()); merged.Add("tieLines", new JArray());
if (template["joinMaps"] != null)
merged.Add("joinMaps", template["joinMaps"]);
else
merged.Add("joinMaps", new JObject());
if (system["global"] != null) if (system["global"] != null)
merged.Add("global", Merge(template["global"], system["global"], "global")); merged.Add("global", Merge(template["global"], system["global"], "global"));
else else