pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-01-11 19:44:44 +00:00
Code Issues Packages Projects Releases 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
parent 812181c30c 91d25088a3
commit 76443f0825
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)