]> git.proxmox.com Git - pve-manager.git/commitdiff
ui: Utils: delete_if_default: add values by correct type
authorDominik Csapak <d.csapak@proxmox.com>
Thu, 9 Apr 2020 14:10:47 +0000 (16:10 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Sun, 26 Apr 2020 11:12:28 +0000 (13:12 +0200)
if 'delete' is an Array, we want to push into it, not append a string
this could be an issue when we use an edit window with multiple inputpanels
and deleteEmpty set on some fields

we then could have an aray like this:

values: {
    delete: [
'foo',
'bar',
'baz, qux',
    ],
},

which the edit window does not handle correctly anymore
(it only does string splitting if 'delete' itself is a string)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
www/manager6/Utils.js

index 59db6d93dc47ff656a831bce20cc46e8d4ff2c5b..c6da2513fb49a1f049d79ba971f8b3928b4fdd26 100644 (file)
@@ -1247,7 +1247,11 @@ Ext.define('PVE.Utils', { utilities: {
        if (values[fieldname] === '' || values[fieldname] === default_val) {
            if (!create) {
                if (values['delete']) {
-                   values['delete'] += ',' + fieldname;
+                   if (Ext.isArray(values['delete'])) {
+                       values['delete'].push(fieldname);
+                   } else {
+                       values['delete'] += ',' + fieldname;
+                   }
                } else {
                    values['delete'] = fieldname;
                }