mirror of
https://github.com/node-red/node-red
synced 2024-11-21 15:43:16 +00:00
Merge pull request #4892 from GogoVega/fix-4891
Fix `link call` node can call out of a subflow
This commit is contained in:
commit
b1bfba8b01
@ -2408,7 +2408,7 @@ RED.nodes = (function() {
|
||||
}
|
||||
// If importing a link node, ensure both ends of each link are either:
|
||||
// - not in a subflow
|
||||
// - both in the same subflow
|
||||
// - both in the same subflow (not for link call node)
|
||||
if (/^link /.test(n.type) && n.links) {
|
||||
n.links = n.links.filter(function(id) {
|
||||
const otherNode = node_map[id] || RED.nodes.node(id);
|
||||
@ -2419,6 +2419,10 @@ RED.nodes = (function() {
|
||||
if (otherNode.z === n.z) {
|
||||
// Both ends in the same flow/subflow
|
||||
return true
|
||||
} else if (n.type === "link call" && !!getSubflow(otherNode.z)) {
|
||||
// Link call node can call out of a subflow as long as otherNode is
|
||||
// not in a subflow
|
||||
return false
|
||||
} else if (!!getSubflow(n.z) || !!getSubflow(otherNode.z)) {
|
||||
// One end is in a subflow - remove the link
|
||||
return false
|
||||
|
Loading…
Reference in New Issue
Block a user