[pve-devel] applied: [PATCH manager] fix #2058: show correct pool for external ceph clusters

[Thomas Lamprecht]

On 1/18/19 2:09 PM, Dominik Csapak wrote:
> instead of having two inputfields and displayfields (where only one gets the
> correct value), have two inputfileds but one displayfield when we need it
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  www/manager6/storage/RBDEdit.js | 28 ++++++++++++++++++++--------
>  1 file changed, 20 insertions(+), 8 deletions(-)

applied, thanks!

> 
> diff --git a/www/manager6/storage/RBDEdit.js b/www/manager6/storage/RBDEdit.js
> index d44a1e9f..33ffcbdc 100644
> --- a/www/manager6/storage/RBDEdit.js
> +++ b/www/manager6/storage/RBDEdit.js
> @@ -100,9 +100,11 @@ Ext.define('PVE.storage.RBDInputPanel', {
>  	}
>  	me.type = 'rbd';
>  
> -	me.column1 = [
> -	    {
> -		xtype: me.isCreate ? 'pveCephPoolSelector' : 'displayfield',
> +	me.column1 = [];
> +
> +	if (me.isCreate) {
> +	    me.column1.push({
> +		xtype: 'pveCephPoolSelector',
>  		nodename: me.nodename,
>  		name: 'pool',
>  		bind: {
> @@ -112,9 +114,8 @@ Ext.define('PVE.storage.RBDInputPanel', {
>  		},
>  		fieldLabel: gettext('Pool'),
>  		allowBlank: false
> -	    },
> -	    {
> -		xtype: me.isCreate ? 'textfield' : 'displayfield',
> +	    },{
> +		xtype: 'textfield',
>  		name: 'pool',
>  		value: 'rbd',
>  		bind: {
> @@ -124,7 +125,18 @@ Ext.define('PVE.storage.RBDInputPanel', {
>  		},
>  		fieldLabel: gettext('Pool'),
>  		allowBlank: false
> -	    },
> +	    });
> +	} else {
> +	    me.column1.push({
> +		xtype: 'displayfield',
> +		nodename: me.nodename,
> +		name: 'pool',
> +		fieldLabel: gettext('Pool'),
> +		allowBlank: false
> +	    });
> +	}
> +
> +	me.column1.push(
>  	    {
>  		xtype: 'textfield',
>  		name: 'monhost',
> @@ -159,7 +171,7 @@ Ext.define('PVE.storage.RBDInputPanel', {
>  		fieldLabel: gettext('User name'),
>  		allowBlank: true
>  	    }
> -	];
> +	);
>  
>  	me.column2 = [
>  	    {
>