[pve-devel] [PATCH manager] ui: rbd: cephfs: add keyring/secret field for external clusters
Fabian Ebner
f.ebner at proxmox.com
Mon Jan 24 13:54:51 CET 2022
Am 26.11.21 um 17:44 schrieb Aaron Lauterer:
> Manual switching of xtype because binding 'hidden' does not work with
> pmxDisplayEditField.
>
Except for two style nits:
Reviewed-by: Fabian Ebner <f.ebner at proxmox.com>
Tested-by: Fabian Ebner <f.ebner at proxmox.com>
> Signed-off-by: Aaron Lauterer <a.lauterer at 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..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',
Should there be a gettext or is this enough of a technical term in this
context?
> + value: me.isCreate? '' : '***********',
Style nit: no space before '?' and eslint doesn't seem to catch it ;)
> + 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',
Same question here
> + value: me.isCreate? '' : '***********',
and style nit here.
> + allowBlank: false,
> + bind: {
> + hidden: '{pveceph}',
> + disabled: '{pveceph}',
> + },
> + },
> {
> xtype: 'proxmoxcheckbox',
> name: 'pveceph',
More information about the pve-devel
mailing list