Skip to content

Commit

Permalink
feat: adds levelControlLists to config reader merge methos
Browse files Browse the repository at this point in the history
  • Loading branch information
ndorin committed May 17, 2024
1 parent d428117 commit 2c273cd
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/Pepperdash Core/Config/PortalConfigReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,15 @@ public static JObject MergeConfigs(JObject doubleConfig)
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)
if (system["levelControlLists"] == null)
merged.Add("levelControlLists", template["levelControlLists"]);
else
merged.Add("levelControlLists",
Merge(template["levelControlLists"], system["levelControlLists"], "levelControlLists"));

// Template tie lines take precedence. Config tool doesn't do them at system
// level anyway...
if (template["tieLines"] != null)
merged.Add("tieLines", template["tieLines"]);
else if (system["tieLines"] != null)
merged.Add("tieLines", system["tieLines"]);
Expand Down

0 comments on commit 2c273cd

Please sign in to comment.