From a6b6e469a91c5d45ddfc9bedb244e4223b07eca9 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 17 Dec 2015 17:45:59 +0100 Subject: [PATCH] feature #4184: Add labels support to hosts-tab --- src/sunstone/etc/sunstone-views/admin.yaml | 1 + src/sunstone/etc/sunstone-views/admin_vcenter.yaml | 1 + src/sunstone/etc/sunstone-views/user.yaml | 1 + src/sunstone/public/app/tabs/hosts-tab/datatable.js | 13 ++++++++++--- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 050b980d29..fb522dde12 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -346,6 +346,7 @@ tabs: #- 10 # IM MAD #- 11 # VM MAD #- 12 # Last monitored on + #- 13 # Labels actions: Host.refresh: true Host.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 778a2027ff..ba361d2ca5 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -346,6 +346,7 @@ tabs: #- 10 # IM MAD #- 11 # VM MAD #- 12 # Last monitored on + #- 13 # Labels actions: Host.refresh: true Host.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index 42b8627c74..f779907b45 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -347,6 +347,7 @@ tabs: #- 10 # IM MAD #- 11 # VM MAD #- 12 # Last monitored on + #- 13 # Labels actions: Host.refresh: true Host.create_dialog: true diff --git a/src/sunstone/public/app/tabs/hosts-tab/datatable.js b/src/sunstone/public/app/tabs/hosts-tab/datatable.js index 9b575684fc..0c382437fa 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/datatable.js +++ b/src/sunstone/public/app/tabs/hosts-tab/datatable.js @@ -25,7 +25,9 @@ define(function(require) { var Humanize = require('utils/humanize'); var CPUBars = require('./utils/cpu-bars'); var MemoryBars = require('./utils/memory-bars'); - var OpenNebulaHost = require('opennebula/host') + var OpenNebulaHost = require('opennebula/host'); + var LabelsUtils = require('utils/labels/utils'); + /* CONSTANTS @@ -34,6 +36,8 @@ define(function(require) { var RESOURCE = "Host"; var XML_ROOT = "HOST"; var TAB_NAME = require('./tabId'); + var LABELS_COLUMN = 13; + var TEMPLATE_ATTR = 'TEMPLATE'; /* CONSTRUCTOR @@ -45,6 +49,7 @@ define(function(require) { this.dataTableId = dataTableId; this.resource = RESOURCE; this.xmlRoot = XML_ROOT; + this.labelsColumn = LABELS_COLUMN; this.dataTableOptions = { "bAutoWidth": false, @@ -70,7 +75,8 @@ define(function(require) { Locale.tr("Status"), Locale.tr("IM MAD"), Locale.tr("VM MAD"), - Locale.tr("Last monitored on") + Locale.tr("Last monitored on"), + Locale.tr("Labels") ]; this.selectOptions = { @@ -157,7 +163,8 @@ define(function(require) { OpenNebulaHost.simpleStateStr(element.STATE), element.IM_MAD, element.VM_MAD, - Humanize.prettyTime(element.LAST_MON_TIME) + Humanize.prettyTime(element.LAST_MON_TIME), + (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'') ]; }