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

Merge pull request #44 from PepperDash/feature/destinationLists-merge

Browse source 
add 'destinationLists' object to merge method
This commit is contained in:
Andrew Welker 2020-07-17 18:08:45 -07:00 • committed by GitHub
commit 76443f0825
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,12 @@ namespace PepperDash.Core.Config
else else
merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists")); merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists"));
if (system["destinationLists"] == null)
merged.Add("destinationLists", template["destinationLists"]);
else
merged.Add("destinationLists",
Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
// Template tie lines take precedence. Config tool doesn't do them at system // Template tie lines take precedence. Config tool doesn't do them at system
// level anyway... // level anyway...
if (template["tieLines"] != null) if (template["tieLines"] != null)