Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2021-01-07 10:17:50 +00:00
17 changed files with 167 additions and 27 deletions

View File

@@ -112,8 +112,8 @@ class Subflow extends Flow {
this.node_map = node_map;
this.path = parent.path+"/"+(subflowInstance._alias||subflowInstance.id);
this.templateCredentials = credentials.get(subflowDef.id);
this.instanceCredentials = credentials.get(this.id);
this.templateCredentials = credentials.get(subflowDef.id) || {};
this.instanceCredentials = credentials.get(this.id) || {};
var env = [];
if (this.subflowDef.env) {