optimize resourcestore field collection

instead of doing weird if/elsif checks with nonsensical logic

we simply check the 3 properties we want (namely convert,calculate and
defaultValue) and add them to our field definition.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js
index fcdc1e27060e90434457bd77c1c3ff7c0895f921..e8979804dfe31be6cb5d792cecd4a9b8c1a7d661 100644 (file)
--- a/www/manager6/data/ResourceStore.js
+++ b/www/manager6/data/ResourceStore.js
@@ -242,20 +242,21 @@ Ext.define('PVE.data.ResourceStore', {
        var fields = [];
        var fieldNames = [];
        Ext.Object.each(field_defaults, function(key, value) {
-           if (!Ext.isDefined(value.convert) && !Ext.isDefined(value.calculate)) {
-               var field = {name: key, type: value.type};
-               if (Ext.isDefined(value.defaultValue)) {
-                   field.defaultValue = value.defaultValue;
-               }
-               fields.push(field);
-               fieldNames.push(key);
-           } else if (key === 'text' || key === 'running') {
-               fields.push({name: key, type: value.type, convert: value.convert});
-               fieldNames.push(key);
-           } else {
-               value.name = key;
-               fields.push(value);
+           var field = {name: key, type: value.type};
+           if (Ext.isDefined(value.convert)) {
+               field.convert = value.convert;
+           }
+
+           if (Ext.isDefined(value.calculate)) {
+               field.calculate = value.calculate;
            }
+
+           if (Ext.isDefined(value.defaultValue)) {
+               field.defaultValue = value.defaultValue;
+           }
+
+           fields.push(field);
+           fieldNames.push(key);
        });
 
        Ext.define('PVEResources', {