by converting the textfield into a textarea and validate the value line wise (if there is more than one line)
Signed-off-by: Dominik Csapak <[email protected]> --- www/manager6/lxc/CreateWizard.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/www/manager6/lxc/CreateWizard.js b/www/manager6/lxc/CreateWizard.js index 0b82cc1c..e74b0b5c 100644 --- a/www/manager6/lxc/CreateWizard.js +++ b/www/manager6/lxc/CreateWizard.js @@ -120,17 +120,29 @@ Ext.define('PVE.lxc.CreateWizard', { }, }, { - xtype: 'proxmoxtextfield', + xtype: 'textarea', name: 'ssh-public-keys', value: '', - fieldLabel: gettext('SSH public key'), + fieldLabel: gettext('SSH public key(s)'), allowBlank: true, validator: function(value) { let pwfield = this.up().down('field[name=password]'); if (value.length) { - let key = PVE.Parser.parseSSHKey(value); - if (!key) { - return "Failed to recognize ssh key"; + if (value.indexOf('\n') !== -1) { + let err; + value.split('\n').forEach((key) => { + if (key !== '' && !PVE.Parser.parseSSHKey(key)) { + err = "Failed to recognize ssh key"; + } + }); + if (err) { + return err; + } + } else { + let key = PVE.Parser.parseSSHKey(value); + if (!key) { + return "Failed to recognize ssh key"; + } } pwfield.allowBlank = true; } else { @@ -166,7 +178,7 @@ Ext.define('PVE.lxc.CreateWizard', { listeners: { change: function(btn, e, value) { e = e.event; - let field = this.up().down('proxmoxtextfield[name=ssh-public-keys]'); + let field = this.up().down('textarea[name=ssh-public-keys]'); PVE.Utils.loadSSHKeyFromFile(e.target.files[0], v => field.setValue(v)); btn.reset(); }, -- 2.30.2 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
