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 F3F6373662 for ; Thu, 7 Oct 2021 14:45:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EB7CB1A2CD for ; Thu, 7 Oct 2021 14:45:19 +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 67BD31A2BF for ; Thu, 7 Oct 2021 14:45:19 +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 401564588F for ; Thu, 7 Oct 2021 14:45:19 +0200 (CEST) To: pve-devel@lists.proxmox.com, Lorenz Stechauner References: <20210928130711.4033669-1-l.stechauner@proxmox.com> <20210928130711.4033669-4-l.stechauner@proxmox.com> From: Fabian Ebner Message-ID: <14727d21-798b-08f3-741b-6f01fc61bc45@proxmox.com> Date: Thu, 7 Oct 2021 14:45:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210928130711.4033669-4-l.stechauner@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.261 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 NICE_REPLY_A -1.964 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH v2 manager 2/2] fix 3850: ui: storage: using PreallocationSelector for file based storage types 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: Thu, 07 Oct 2021 12:45:50 -0000 Am 28.09.21 um 15:07 schrieb Lorenz Stechauner: > Signed-off-by: Lorenz Stechauner > --- > www/manager6/controller/StorageEdit.js | 6 ++++++ > www/manager6/storage/Base.js | 18 ++++++++++++++++++ > www/manager6/storage/NFSEdit.js | 2 +- > 3 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/www/manager6/controller/StorageEdit.js b/www/manager6/controller/StorageEdit.js > index 4246d363..cb73b776 100644 > --- a/www/manager6/controller/StorageEdit.js > +++ b/www/manager6/controller/StorageEdit.js > @@ -4,6 +4,12 @@ Ext.define('PVE.controller.StorageEdit', { > control: { > 'field[name=content]': { > change: function(field, value) { > + const hasImages = Ext.Array.contains(value, 'images'); > + const prealloc = field.up('form').getForm().findField('preallocation'); > + if (prealloc) { > + prealloc.setDisabled(!hasImages); > + } > + > var hasBackups = Ext.Array.contains(value, 'backup'); > var maxfiles = this.lookupReference('maxfiles'); > if (!maxfiles) { > diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js > index f339e8cd..404a90f5 100644 > --- a/www/manager6/storage/Base.js > +++ b/www/manager6/storage/Base.js > @@ -51,6 +51,24 @@ Ext.define('PVE.panel.StorageBase', { > }, > ); > > + const qemuImgStorageTypes = ['dir', 'btrfs', 'nfs', 'cifs']; > + > + if (qemuImgStorageTypes.includes(me.type)) { > + const preallocSelector = { > + xtype: 'pvePreallocationSelector', > + name: 'preallocation', > + fieldLabel: gettext('Preallocation'), > + allowBlank: false, > + value: '__default__', > + }; > + > + if (me.advancedColumn1) { > + me.advancedColumn1.unshift(preallocSelector); > + } else { > + me.advancedColumn1 = [preallocSelector]; > + } Nit: Pushing (or unshifting) the selector onto the advanced column with fewer elements seems a bit more future-proof to me: me.advancedColumn1 = me.advancedColumn1 || []; me.advancedColumn2 = me.advancedColumn2 || []; if (me.advancedColumn2.length < me.advancedColumn1.length) { me.advancedColumn2.push(preallocSelector); } else { me.advancedColumn1.push(preallocSelector); } Then the change for NFS below wouldn't be necessary either, but of course no big deal. > + } > + > me.callParent(); > }, > }); > diff --git a/www/manager6/storage/NFSEdit.js b/www/manager6/storage/NFSEdit.js > index faa41732..202c7de0 100644 > --- a/www/manager6/storage/NFSEdit.js > +++ b/www/manager6/storage/NFSEdit.js > @@ -143,7 +143,7 @@ Ext.define('PVE.storage.NFSInputPanel', { > }, > ]; > > - me.advancedColumn1 = [ > + me.advancedColumn2 = [ > { > xtype: 'proxmoxKVComboBox', > fieldLabel: gettext('NFS Version'), >