diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 9f6178829e..779bf034f4 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -158,6 +158,7 @@ tabs: #- 10 # Start Time - 11 # VNC #- 12 # Hidden Template + #- 13 # Labels actions: VM.refresh: true VM.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 2947892c9a..acad50450e 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -158,6 +158,7 @@ tabs: #- 10 # Start Time - 11 # VNC #- 12 # Hidden Template + #- 13 # Labels actions: VM.refresh: true VM.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index 28b87621d7..d7ad58cb4d 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -159,6 +159,7 @@ tabs: #- 10 # Start Time - 11 # VNC #- 12 # Hidden Template + #- 13 # Labels actions: VM.refresh: true VM.create_dialog: true diff --git a/src/sunstone/public/app/tabs/vms-tab/datatable.js b/src/sunstone/public/app/tabs/vms-tab/datatable.js index 33d1040adb..2c647f3903 100644 --- a/src/sunstone/public/app/tabs/vms-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vms-tab/datatable.js @@ -37,6 +37,7 @@ define(function(require) { var RESOURCE = "VM"; var XML_ROOT = "VM"; var TAB_NAME = require('./tabId'); + var LABELS_COLUMN = 13; /* @@ -49,6 +50,7 @@ define(function(require) { this.dataTableId = dataTableId; this.resource = RESOURCE; this.xmlRoot = XML_ROOT; + this.labelsColumn = LABELS_COLUMN; this.dataTableOptions = { "bAutoWidth": false, diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js index 3a80db9e2e..7b1fd3fc3a 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js @@ -20,9 +20,11 @@ define(function(require) { var Locale = require('utils/locale'); var Humanize = require('utils/humanize'); var TemplateUtils = require('utils/template-utils'); + var LabelsUtils = require('utils/labels/utils'); var RESOURCE = "VM"; var XML_ROOT = "VM"; + var TEMPLATE_ATTR = 'USER_TEMPLATE'; var _columns = [ Locale.tr("ID") , @@ -36,7 +38,8 @@ define(function(require) { Locale.tr("IPs"), Locale.tr("Start Time"), "", - Locale.tr("Hidden Template") + Locale.tr("Hidden Template"), + Locale.tr("Labels") ]; return { @@ -85,18 +88,19 @@ define(function(require) { 'name="selected_items" '+ 'value="' + element.ID + '" '+ 'state="'+element.STATE+'" lcm_state="'+element.LCM_STATE+'"/>', - element.ID, - element.UNAME, - element.GNAME, - element.NAME, - state, - cpuMonitoring, - Humanize.size(memoryMonitoring), - OpenNebulaVM.hostnameStr(element), - OpenNebulaVM.ipsStr(element), - Humanize.prettyTime(element.STIME), - vncIcon, - TemplateUtils.templateToString(element) + element.ID, + element.UNAME, + element.GNAME, + element.NAME, + state, + cpuMonitoring, + Humanize.size(memoryMonitoring), + OpenNebulaVM.hostnameStr(element), + OpenNebulaVM.ipsStr(element), + Humanize.prettyTime(element.STIME), + vncIcon, + TemplateUtils.templateToString(element), + (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'') ]; } @@ -116,6 +120,7 @@ define(function(require) { "", "", "", + "", "" ]; }