From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7D48AC4CF for ; Fri, 15 Sep 2023 11:46:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5A815A9A7 for ; Fri, 15 Sep 2023 11:46:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 15 Sep 2023 11:46:40 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 67FE1475BC for ; Fri, 15 Sep 2023 11:46:40 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Fri, 15 Sep 2023 11:46:35 +0200 Message-Id: <20230915094635.61759-3-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915094635.61759-1-g.goller@proxmox.com> References: <20230915094635.61759-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.415 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [f.id, f.name] Subject: [pbs-devel] [PATCH widget-toolkit 2/2] window: edit: added `convertNewlines` config X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Sep 2023 09:46:41 -0000 When setting `convertNewlines` to true, all the '\n' will be converted to '
' tags and vice-versa. This means we can press enter in a `textfieldarea`, save the config and we get a '
' in the config file. When editing the value, the '
' will be converted back to a '\n'. Signed-off-by: Gabriel Goller --- Note: Implemented to close #4589 (support multi-line comments) src/window/Edit.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/window/Edit.js b/src/window/Edit.js index 7f94e30..97cd4d2 100644 --- a/src/window/Edit.js +++ b/src/window/Edit.js @@ -66,6 +66,9 @@ Ext.define('Proxmox.window.Edit', { // onlineHelp of our first item, if set. onlineHelp: undefined, + // converts newlines '\n' to html '
' tags and vice-versa + convertNewlines: false, + isValid: function() { let me = this; @@ -83,7 +86,15 @@ Ext.define('Proxmox.window.Edit', { form.getFields().each(function(field) { if (!field.up('inputpanel') && (!dirtyOnly || field.isDirty())) { - Proxmox.Utils.assemble_field_data(values, field.getSubmitData()); + let fieldData = field.getSubmitData(); + if (me.convertNewlines) { + for (let key in fieldData) { + if (typeof fieldData[key] === 'string' || fieldData[key] instanceof String) { + fieldData[key] = fieldData[key].replaceAll('\n', '
'); + } + } + } + Proxmox.Utils.assemble_field_data(values, fieldData); } }); @@ -105,7 +116,13 @@ Ext.define('Proxmox.window.Edit', { (f.id === id || f.name === id || f.dataIndex === id) && !f.up('inputpanel'), ); fields.each((field) => { + if (me.convertNewlines) { + if (typeof val === 'string' || val instanceof String) { + val = val.replaceAll('
', '\n'); + } + } field.setValue(val); + if (form.trackResetOnLoad) { field.resetOriginalValue(); } -- 2.39.2