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 F23877096F for ; Mon, 6 Sep 2021 13:32:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E345610354 for ; Mon, 6 Sep 2021 13:32:38 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CFA9C10319 for ; Mon, 6 Sep 2021 13:32:36 +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 8877F445CE for ; Mon, 6 Sep 2021 13:32:36 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 6 Sep 2021 13:32:28 +0200 Message-Id: <20210906113231.61790-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210906113231.61790-1-f.ebner@proxmox.com> References: <20210906113231.61790-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.387 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pve-devel] [PATCH manager 3/6] ui: prune edit: prepare for being re-used for backup jobs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 11:32:39 -0000 1. Rename the isPBS variable to match the actual purpose. When editing a backup job, the hint should not be shown, even if the storage is PBS. 2. Allow specifying the text used for the fallback hint. For backup jobs, the first fallback is the storage configuration, so the text needs to be different there. 3. Make using keep-all=1 by default upon creation optional. For backup jobs, the default should be "use fallback", i.e. no settings. Signed-off-by: Fabian Ebner --- www/manager6/panel/EditPruneInputPanel.js | 10 ++++++---- www/manager6/storage/Base.js | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/www/manager6/panel/EditPruneInputPanel.js b/www/manager6/panel/EditPruneInputPanel.js index d58db208..547daecc 100644 --- a/www/manager6/panel/EditPruneInputPanel.js +++ b/www/manager6/panel/EditPruneInputPanel.js @@ -13,7 +13,7 @@ Ext.define('PVE.panel.EditPruneInputPanel', { if (this.needMask) { // isMasked() may not yet be true if not rendered once return {}; } else if (this.isCreate && !this.rendered) { - return { 'prune-backups': 'keep-all=1' }; + return this.keepAllDefaultForCreate ? { 'prune-backups': 'keep-all=1' } : {}; } delete formValues.delete; let retention = PVE.Parser.printPropertyString(formValues); @@ -52,10 +52,10 @@ Ext.define('PVE.panel.EditPruneInputPanel', { panel.mask( gettext('Backup content type not available for this storage.'), ); - } else if (panel.isCreate) { + } else if (panel.isCreate && panel.keepAllDefaultForCreate) { panel.down('proxmoxcheckbox[name=keep-all]').setValue(true); } - panel.down('component[name=pbs-hint]').setHidden(!panel.isPBS); + panel.down('component[name=pbs-hint]').setHidden(!panel.showPBSHint); panel.query('pmxPruneKeepField').forEach(field => { field.on('change', panel.updateComponents, panel); @@ -83,7 +83,9 @@ Ext.define('PVE.panel.EditPruneInputPanel', { name: 'no-keeps-hint', hidden: true, padding: '5 1', - html: gettext('Without any keep option, the node\'s vzdump.conf or `keep-all` is used as fallback for backup jobs'), + cbind: { + html: '{fallbackHintHtml}', + }, }, { xtype: 'component', diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js index 862c981b..ffafc87e 100644 --- a/www/manager6/storage/Base.js +++ b/www/manager6/storage/Base.js @@ -100,7 +100,9 @@ Ext.define('PVE.storage.BaseEdit', { xtype: 'pveEditPruneInputPanel', title: gettext('Backup Retention'), isCreate: me.isCreate, - isPBS: me.ipanel.isPBS, + keepAllDefaultForCreate: true, + showPBSHint: me.ipanel.isPBS, + fallbackHintHtml: gettext('Without any keep option, the node\'s vzdump.conf or `keep-all` is used as fallback for backup jobs'), }, ], }, -- 2.30.2