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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 93ACDC4DE for ; Fri, 15 Sep 2023 11:47:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6ADB0AA15 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 64A93475BB 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:34 +0200 Message-Id: <20230915094635.61759-2-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.402 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. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/2] close #4589: allow multi-line comments in datastore notes 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:47:11 -0000 Converting '\n' to '
' tags then store it in the config (`datastore.cfg`) file. Signed-off-by: Gabriel Goller --- pbs-api-types/src/datastore.rs | 6 +++--- www/datastore/Notes.js | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 73c4890e..4e555d0c 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -11,8 +11,8 @@ use proxmox_schema::{ use crate::{ Authid, CryptMode, Fingerprint, MaintenanceMode, Userid, DATASTORE_NOTIFY_STRING_SCHEMA, - GC_SCHEDULE_SCHEMA, PROXMOX_SAFE_ID_FORMAT, PRUNE_SCHEDULE_SCHEMA, SHA256_HEX_REGEX, - SINGLE_LINE_COMMENT_SCHEMA, UPID, + GC_SCHEDULE_SCHEMA, MULTI_LINE_COMMENT_SCHEMA, PROXMOX_SAFE_ID_FORMAT, PRUNE_SCHEDULE_SCHEMA, + SHA256_HEX_REGEX, SINGLE_LINE_COMMENT_SCHEMA, UPID, }; const_regex! { @@ -241,7 +241,7 @@ pub const DATASTORE_TUNING_STRING_SCHEMA: Schema = StringSchema::new("Datastore }, comment: { optional: true, - schema: SINGLE_LINE_COMMENT_SCHEMA, + schema: MULTI_LINE_COMMENT_SCHEMA, }, "gc-schedule": { optional: true, diff --git a/www/datastore/Notes.js b/www/datastore/Notes.js index 2928b7ec..300603fc 100644 --- a/www/datastore/Notes.js +++ b/www/datastore/Notes.js @@ -21,10 +21,11 @@ Ext.define('PBS.DataStoreNotes', { title: gettext('Comment'), width: 600, resizable: true, + convertNewlines: true, layout: 'fit', defaultButton: undefined, items: { - xtype: 'textfield', + xtype: 'textareafield', name: 'comment', value: '', hideLabel: true, @@ -42,7 +43,7 @@ Ext.define('PBS.DataStoreNotes', { setNotes: function(value) { let me = this; var data = value || ''; - me.update(Ext.htmlEncode(data)); + me.update(data); if (me.collapsible && me.collapseMode === 'auto') { me.setCollapsed(data === ''); -- 2.39.2