frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Allow subflow to be edited if instance exists on locked flow

Browse Source
This commit is contained in:
Nick O'Leary 2022-12-03 22:30:35 +00:00
parent 3630056ed8
commit dce1cccbde
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/ui/palette.js vendored
View File

@ -290,7 +290,7 @@ RED.palette = (function() {
revertDuration: 200, revertDuration: 200,
containment:'#red-ui-main-container', containment:'#red-ui-main-container',
start: function() { start: function() {
dropEnabled = !RED.nodes.workspace(RED.workspaces.active()).locked; dropEnabled = !(RED.nodes.workspace(RED.workspaces.active())?.locked);
paletteWidth = $("#red-ui-palette").width(); paletteWidth = $("#red-ui-palette").width();
paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top; paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top;
hoverGroup = null; hoverGroup = null;

8
packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js vendored
View File

@ -273,6 +273,11 @@ RED.subflow = (function() {
var subflowInstances = []; var subflowInstances = [];
if (activeSubflow) { if (activeSubflow) {
RED.nodes.filterNodes({type:"subflow:"+activeSubflow.id}).forEach(function(n) { RED.nodes.filterNodes({type:"subflow:"+activeSubflow.id}).forEach(function(n) {
const parentFlow = RED.nodes.workspace(n.z)
const wasLocked = parentFlow && parentFlow.locked
if (wasLocked) {
parentFlow.locked = false
}
subflowInstances.push({ subflowInstances.push({
id: n.id, id: n.id,
changed: n.changed changed: n.changed
@ -285,6 +290,9 @@ RED.subflow = (function() {
n.resize = true; n.resize = true;
n.dirty = true; n.dirty = true;
RED.editor.updateNodeProperties(n); RED.editor.updateNodeProperties(n);
if (wasLocked) {
parentFlow.locked = true
}
}); });
RED.editor.validateNode(activeSubflow); RED.editor.validateNode(activeSubflow);
return { return {