From 8dcb498514f2e6e4d40f97a642dbbb2caeb6999f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 17 Dec 2015 17:52:31 +0100 Subject: [PATCH] feature #4184: Add labels support to datastore-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/datastores-tab/datatable.js | 8 +++++++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index fb522dde12..0d2847fec5 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -372,6 +372,7 @@ tabs: #- 9 # DS - 10 # Type - 11 # Status + #- 12 # Labels actions: Datastore.refresh: true Datastore.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index ba361d2ca5..0724fac197 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -372,6 +372,7 @@ tabs: #- 9 # DS - 10 # Type - 11 # Status + #- 12 # Labels actions: Datastore.refresh: true Datastore.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index f779907b45..d57225f2f1 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -373,6 +373,7 @@ tabs: #- 9 # DS #- 10 # Type #- 11 # Status + #- 12 # Labels actions: Datastore.refresh: true Datastore.create_dialog: false diff --git a/src/sunstone/public/app/tabs/datastores-tab/datatable.js b/src/sunstone/public/app/tabs/datastores-tab/datatable.js index 762e4622a5..7f0ffd230a 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/datatable.js +++ b/src/sunstone/public/app/tabs/datastores-tab/datatable.js @@ -24,6 +24,7 @@ define(function(require) { var Locale = require('utils/locale'); var OpenNebulaDatastore = require('opennebula/datastore'); var DatastoreCapacityBar = require('./utils/datastore-capacity-bar'); + var LabelsUtils = require('utils/labels/utils'); /* CONSTANTS @@ -32,6 +33,8 @@ define(function(require) { var RESOURCE = "Datastore"; var XML_ROOT = "DATASTORE"; var TAB_NAME = require('./tabId'); + var LABELS_COLUMN = 12; + var TEMPLATE_ATTR = 'TEMPLATE'; /* CONSTRUCTOR @@ -57,6 +60,7 @@ define(function(require) { this.dataTableId = dataTableId; this.resource = RESOURCE; this.xmlRoot = XML_ROOT; + this.labelsColumn = LABELS_COLUMN; this.dataTableOptions = { "bAutoWidth": false, @@ -83,6 +87,7 @@ define(function(require) { Locale.tr("DS MAD"), Locale.tr("Type"), Locale.tr("Status"), + Locale.tr("Labels") ] this.selectOptions = { @@ -125,7 +130,8 @@ define(function(require) { element.TM_MAD, element.DS_MAD, OpenNebulaDatastore.typeStr(element.TYPE), - OpenNebulaDatastore.stateStr(element.STATE) + OpenNebulaDatastore.stateStr(element.STATE), + (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'') ]; } });