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 2332962F0D for ; Tue, 24 Nov 2020 15:32:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 13266F02B for ; Tue, 24 Nov 2020 15:31:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 89C72F023 for ; Tue, 24 Nov 2020 15:31:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4F16640A8F for ; Tue, 24 Nov 2020 15:31:42 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 15:31:36 +0100 Message-Id: <20201124143136.29247-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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] ui: storage: show no-keeps hint exactly when needed 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: Tue, 24 Nov 2020 14:32:13 -0000 extracting the logic from the previous checkbox listener into a function, which is also called on field changes and once in afterrender. Calling it initially makes sure the hint is also displayed at the beginning when editing a storage with no retention options configured, and the initial disabling of the input fields for the isCreate case now also happens through that call. Signed-off-by: Fabian Ebner --- Not too happy about the function name, but couldn't come up with anything better. www/manager6/storage/Base.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js index 6113743d..4dd84b87 100644 --- a/www/manager6/storage/Base.js +++ b/www/manager6/storage/Base.js @@ -81,6 +81,18 @@ Ext.define('PVE.panel.StoragePruneInputPanel', { return options; }, + updateComponents: function() { + let panel = this; + + let keepAll = panel.down('proxmoxcheckbox[name=keep-all]').getValue(); + let anyValue = false; + panel.query('pmxPruneKeepField').forEach(field => { + anyValue = anyValue || field.getValue() !== null; + field.setDisabled(keepAll); + }); + panel.down('component[name=no-keeps-hint]').setHidden(anyValue || keepAll); + }, + listeners: { afterrender: function(panel) { if (panel.needMask) { @@ -89,12 +101,14 @@ Ext.define('PVE.panel.StoragePruneInputPanel', { gettext('Backup content type not available for this storage.'), ); } else if (panel.isCreate) { - panel.query('pmxPruneKeepField').forEach(field => { - field.setDisabled(true); - }); panel.down('proxmoxcheckbox[name=keep-all]').setValue(true); } panel.down('component[name=pbs-hint]').setHidden(!panel.isPBS); + + panel.query('pmxPruneKeepField').forEach(field => { + field.on('change', panel.updateComponents, panel); + }); + panel.updateComponents(); }, }, @@ -105,12 +119,7 @@ Ext.define('PVE.panel.StoragePruneInputPanel', { listeners: { change: function(field, newValue) { let panel = field.up('pveStoragePruneInputPanel'); - let anyValue = false; - panel.query('pmxPruneKeepField').forEach(field => { - anyValue = anyValue || field.getValue() !== null; - field.setDisabled(newValue); - }); - panel.down('component[name=no-keeps-hint]').setHidden(anyValue || newValue); + panel.updateComponents(); }, }, }, -- 2.20.1