instead of having to type out the full path, e.g. 'foo/bar/baz', show a 'pool selector' to select the parent pool.
Forbid using slashes in the name field so it's not possible to specify the structure with both the name and parent pool field. This makes creating nested pools more obvious and easier. Signed-off-by: Dominik Csapak <[email protected]> --- changes from v1: * always delete 'parentPool' from values so we don't accidentally submit it * only consider parentPool if it's a non-empty string * add regex to the namefield to disallow slashes * add emptyText to the poolselector www/manager6/dc/PoolEdit.js | 52 +++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/www/manager6/dc/PoolEdit.js b/www/manager6/dc/PoolEdit.js index 72a084ac..ee39137a 100644 --- a/www/manager6/dc/PoolEdit.js +++ b/www/manager6/dc/PoolEdit.js @@ -17,20 +17,46 @@ Ext.define('PVE.dc.PoolEdit', { items: [ { - xtype: 'pmxDisplayEditField', - fieldLabel: gettext('Name'), - cbind: { - editable: '{isCreate}', - value: '{poolid}', + xtype: 'inputpanel', + onGetValues: function (values) { + if (Ext.isString(values.parentPool) && values.parentPool.length > 0) { + values.poolid = values.parentPool + '/' + values.poolid; + } + delete values.parentPool; + return values; }, - name: 'poolid', - allowBlank: false, - }, - { - xtype: 'textfield', - fieldLabel: gettext('Comment'), - name: 'comment', - allowBlank: true, + items: [ + { + xtype: 'pmxDisplayEditField', + fieldLabel: gettext('Name'), + cbind: { + editable: '{isCreate}', + value: '{poolid}', + }, + editConfig: { + regex: /^[^/]+$/, + }, + name: 'poolid', + allowBlank: false, + }, + { + xtype: 'pvePoolSelector', + name: 'parentPool', + fieldLabel: gettext('Parent Pool'), + allowBlank: true, + emptyText: Proxmox.Utils.NoneText, + cbind: { + disabled: '{!isCreate}', + hidden: '{!isCreate}', + }, + }, + { + xtype: 'textfield', + fieldLabel: gettext('Comment'), + name: 'comment', + allowBlank: true, + }, + ], }, ], -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
