1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge pull request #3822 from Steve-Mcl/backport-3703

Fix credential type input item of subflow template (backport to v2.x)
This commit is contained in:
Nick O'Leary 2022-08-04 12:58:39 +01:00 committed by GitHub
commit b94fdd2f79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,8 +41,12 @@ RED.editor.envVarList = (function() {
style: "width:100%", style: "width:100%",
class: "node-input-env-value", class: "node-input-env-value",
type: "text", type: "text",
}).attr("autocomplete","disable").appendTo(envRow) }).attr("autocomplete","disable").appendTo(envRow);
valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED}); var types = (opt.ui && opt.ui.opts && opt.ui.opts.types);
if (!types) {
types = isTemplateNode ? DEFAULT_ENV_TYPE_LIST : DEFAULT_ENV_TYPE_LIST_INC_CRED;
}
valueField.typedInput({default:'str',types:types});
valueField.typedInput('type', opt.type); valueField.typedInput('type', opt.type);
if (opt.type === "cred") { if (opt.type === "cred") {
if (opt.value) { if (opt.value) {
@ -94,6 +98,11 @@ RED.editor.envVarList = (function() {
} }
opt.ui.label = opt.ui.label || {}; opt.ui.label = opt.ui.label || {};
opt.ui.type = opt.ui.type || "input"; opt.ui.type = opt.ui.type || "input";
if ((opt.ui.type === "cred") &&
opt.ui.opts &&
opt.ui.opts.types) {
opt.ui.type = "input";
}
var uiRow = $('<div/>').appendTo(container).hide(); var uiRow = $('<div/>').appendTo(container).hide();
// save current info for reverting on cancel // save current info for reverting on cancel