From 50713765af3a830e0143a502ac3e0c2421b3794d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 11 Oct 2017 14:10:24 +0200 Subject: [PATCH] ui: GuestStatusView: simplify HA state display simplify HA Information in VM/CT Summary panel. Use the already translated 'HA State' instead of 'Managed by HA' (which now becomes obsolete as it was the single appearance). Simplify PVE.Utils.format_ha respectively to mach the new name, as here is the only use of this function we have no side effects. Signed-off-by: Thomas Lamprecht Acked-by: Dominik Csapak --- www/manager6/Utils.js | 5 ++--- www/manager6/panel/GuestStatusView.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 5a79ffb4..eaecc6f6 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -852,11 +852,10 @@ Ext.define('PVE.Utils', { utilities: { }, format_ha: function(value) { - var text = PVE.Utils.format_boolean(value.managed); + var text = PVE.Utils.noneText; if (value.managed) { - text += ', ' + PVE.Utils.stateText + ': '; - text += value.state || PVE.Utils.noneText; + text = value.state || PVE.Utils.noneText; text += ', ' + PVE.Utils.groupText + ': '; text += value.group || PVE.Utils.noneText; diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js index 59240597..26415437 100644 --- a/www/manager6/panel/GuestStatusView.js +++ b/www/manager6/panel/GuestStatusView.js @@ -24,7 +24,7 @@ Ext.define('PVE.panel.GuestStatusView', { }, { itemId: 'hamanaged', - title: gettext('Managed by HA'), + title: gettext('HA State'), printBar: false, textField: 'ha', renderer: PVE.Utils.format_ha