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

add 'destinationLists' object to merge method

Browse source
This commit is contained in:
Andrew Welker 2020-07-17 15:38:30 -06:00
parent 812181c30c
commit 91d25088a3
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
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
// level anyway...
if (template["tieLines"] != null)