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 0438E824AF for ; Mon, 29 Nov 2021 09:26:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED41A2CF6E for ; Mon, 29 Nov 2021 09:26:11 +0100 (CET) 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 6D7362CF60 for ; Mon, 29 Nov 2021 09:26:11 +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 41D3F4468A for ; Mon, 29 Nov 2021 09:26:11 +0100 (CET) Message-ID: <46a54b66-d7bc-9315-2ec2-c413dc5e8a52@proxmox.com> Date: Mon, 29 Nov 2021 09:26:10 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20211126164446.2558368-1-a.lauterer@proxmox.com> From: Aaron Lauterer In-Reply-To: <20211126164446.2558368-1-a.lauterer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.740 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.317 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 manager] ui: rbd: cephfs: add keyring/secret field for external clusters 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, 29 Nov 2021 08:26:12 -0000 If this gets applied, please fix the commit title by adding the missing f in cehpFs in the last two commits... :) On 11/26/21 17:44, Aaron Lauterer wrote: > Manual switching of xtype because binding 'hidden' does not work with > pmxDisplayEditField. > > Signed-off-by: Aaron Lauterer > --- > www/manager6/storage/CephFSEdit.js | 39 ++++++++++++++++++++---------- > www/manager6/storage/RBDEdit.js | 11 +++++++++ > 2 files changed, 37 insertions(+), 13 deletions(-) > > diff --git a/www/manager6/storage/CephFSEdit.js b/www/manager6/storage/CephFSEdit.js > index 92fdfe63..89459ba8 100644 > --- a/www/manager6/storage/CephFSEdit.js > +++ b/www/manager6/storage/CephFSEdit.js > @@ -101,20 +101,33 @@ Ext.define('PVE.storage.CephFSInputPanel', { > }, > ]; > > - me.columnB = [{ > - xtype: 'proxmoxcheckbox', > - name: 'pveceph', > - reference: 'pvecephRef', > - bind: { > - disabled: '{!pvecephPossible}', > - value: '{pveceph}', > + me.columnB = [ > + { > + xtype: me.isCreate ? 'textfield' : 'displayfield', > + name: 'keyring', > + fieldLabel: 'Secret', > + value: me.isCreate? '' : '***********', > + allowBlank: false, > + bind: { > + hidden: '{pveceph}', > + disabled: '{pveceph}', > + }, > + }, > + { > + xtype: 'proxmoxcheckbox', > + name: 'pveceph', > + reference: 'pvecephRef', > + bind: { > + disabled: '{!pvecephPossible}', > + value: '{pveceph}', > + }, > + checked: true, > + uncheckedValue: 0, > + submitValue: false, > + hidden: !me.isCreate, > + boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'), > }, > - checked: true, > - uncheckedValue: 0, > - submitValue: false, > - hidden: !me.isCreate, > - boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'), > - }]; > + ]; > > me.callParent(); > }, > diff --git a/www/manager6/storage/RBDEdit.js b/www/manager6/storage/RBDEdit.js > index 35568b98..3dcfea20 100644 > --- a/www/manager6/storage/RBDEdit.js > +++ b/www/manager6/storage/RBDEdit.js > @@ -201,6 +201,17 @@ Ext.define('PVE.storage.RBDInputPanel', { > ]; > > me.columnB = [ > + { > + xtype: me.isCreate ? 'textarea' : 'displayfield', > + name: 'keyring', > + fieldLabel: 'Keyring', > + value: me.isCreate? '' : '***********', > + allowBlank: false, > + bind: { > + hidden: '{pveceph}', > + disabled: '{pveceph}', > + }, > + }, > { > xtype: 'proxmoxcheckbox', > name: 'pveceph', >