From 2b2fe160f5f2a4a5e44bbc2ff135cb1fd7e1d97d Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 25 Oct 2016 14:12:23 +0200 Subject: [PATCH] show ha error state in tree and resource grid with this patch, vms in an ha error state get an icon (reusing the node offline icon) to indicate the error in the resource grid, we also add the icon, and have an additional column where we can display the ha state Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 5 +++++ www/manager6/data/ResourceStore.js | 7 +++++++ www/manager6/tree/ResourceTree.js | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 09326641..463a546a 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -961,6 +961,11 @@ Ext.define('PVE.Utils', { utilities: { } } + // overwrite anything else + if (record.data.hastate === 'error') { + gridcls = '-offline'; + } + var fa = ' '; return fa + value; }, diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index cc68b845..9147626c 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -233,6 +233,13 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, sortable: true, width: 110 + }, + hastate: { + header: gettext('HA State'), + type: 'string', + defaultValue: '', + hidden: true, + sortable: true } }; diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index ac487c6c..5cca7cef 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -124,6 +124,11 @@ Ext.define('PVE.tree.ResourceTree', { iconClsAdd = '-offline'; } + // overwrite any other class + if (info.hastate === 'error') { + iconClsAdd = '-offline'; + } + info.iconCls = defaults.iconCls + iconClsAdd; if (info.template) { @@ -288,7 +293,8 @@ Ext.define('PVE.tree.ResourceTree', { if ((item.data.text !== olditem.data.text) || (item.data.running !== olditem.data.running) || (item.data.template !== olditem.data.template) || - (item.data.status !== olditem.data.status)) { + (item.data.status !== olditem.data.status) || + (item.data.hastate!== olditem.data.hastate)) { //console.log("changed node/text/running " + olditem.data.id); changed = true; }