optimize 'running' field

[pve-manager.git] / www / manager6 / data / ResourceStore.js

diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js
index cc68b8457133badab72b0f6bfa6f8157936a9910..fcdc1e27060e90434457bd77c1c3ff7c0895f921 100644 (file)
--- a/www/manager6/data/ResourceStore.js
+++ b/www/manager6/data/ResourceStore.js
@@ -53,11 +53,7 @@ Ext.define('PVE.data.ResourceStore', {
                hidden: true,
                convert: function(value, record) {
                    var info = record.data;
-                   if (info.type === 'qemu' || info.type === 'lxc' || info.type === 'node') {
-                       return (Ext.isNumeric(info.uptime) && (info.uptime > 0));
-                   } else {
-                       return false;
-                   }
+                   return (Ext.isNumeric(info.uptime) && (info.uptime > 0));
                }
            },
            text: {
@@ -233,6 +229,13 @@ Ext.define('PVE.data.ResourceStore', {
                hidden: true,
                sortable: true,
                width: 110
+           },
+           hastate: {
+               header: gettext('HA State'),
+               type: 'string',
+               defaultValue: 'unmanaged',
+               hidden: true,
+               sortable: true
            }
        };
 
@@ -240,7 +243,11 @@ Ext.define('PVE.data.ResourceStore', {
        var fieldNames = [];
        Ext.Object.each(field_defaults, function(key, value) {
            if (!Ext.isDefined(value.convert) && !Ext.isDefined(value.calculate)) {
-               fields.push({name: key, type: value.type});
+               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});
@@ -269,7 +276,7 @@ Ext.define('PVE.data.ResourceStore', {
        Ext.apply(config, {
            storeid: 'PVEResources',
            model: 'PVEResources',
-           defaultColums: function() {
+           defaultColumns: function() {
                var res = [];
                Ext.Object.each(field_defaults, function(field, info) {
                    var fi = Ext.apply({ dataIndex: field }, info);