From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <a.lauterer@proxmox.com>
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 8D1BC63891
for <pve-devel@lists.proxmox.com>; Wed, 26 Jan 2022 11:19:16 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8398265D0
for <pve-devel@lists.proxmox.com>; Wed, 26 Jan 2022 11:18:46 +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 E35C365B9
for <pve-devel@lists.proxmox.com>; Wed, 26 Jan 2022 11:18:45 +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 B718F43AEF
for <pve-devel@lists.proxmox.com>; Wed, 26 Jan 2022 11:18:45 +0100 (CET)
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 26 Jan 2022 11:18:42 +0100
Message-Id: <20220126101844.558040-1-a.lauterer@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.001 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 v2 manager 1/3] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 26 Jan 2022 10:19:16 -0000
Manual switching of xtype because binding 'hidden' does not work with
pmxDisplayEditField.
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
changes: added spaces in front of `?` operator that were missed.
>From previous iteration for this patch:
Reviewed-by: Fabian Ebner <f.ebner@proxmox.com>
Tested-by: Fabian Ebner <f.ebner@proxmox.com>
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..b851f2cc 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..15fc1304 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',
--
2.30.2