From 1f79df30c07eaebabf42ae10b7613f646241529d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 17 Dec 2015 17:39:26 +0100 Subject: [PATCH] feature #4184: Add labels support to files-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/files-tab/actions.js | 1 + src/sunstone/public/app/tabs/files-tab/datatable.js | 8 +++++++- 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index da768e8de3..3b5c812d28 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -290,6 +290,7 @@ tabs: - 10 # Status #- 11 # #VMs #- 12 # Target + #- 13 # Labels actions: File.refresh: true File.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 27fde733e9..b3547dd9e3 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -290,6 +290,7 @@ tabs: - 10 # Status #- 11 # #VMs #- 12 # Target + #- 13 # Labels actions: File.refresh: true File.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index b6cabcd9f1..4feb76edf8 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -291,6 +291,7 @@ tabs: - 10 # Status #- 11 # #VMs #- 12 # Target + #- 13 # Labels actions: File.refresh: true File.create_dialog: true diff --git a/src/sunstone/public/app/tabs/files-tab/actions.js b/src/sunstone/public/app/tabs/files-tab/actions.js index d2f02b6948..f454795bf6 100644 --- a/src/sunstone/public/app/tabs/files-tab/actions.js +++ b/src/sunstone/public/app/tabs/files-tab/actions.js @@ -36,6 +36,7 @@ define(function(require) { "File.refresh" : _commonActions.refresh(), "File.delete" : _commonActions.del(), "File.update_template" : _commonActions.updateTemplate(), + "File.append_template" : _commonActions.appendTemplate(), "File.chown": _commonActions.multipleAction('chown'), "File.chgrp": _commonActions.multipleAction('chgrp'), "File.chmod": _commonActions.singleAction('chmod'), diff --git a/src/sunstone/public/app/tabs/files-tab/datatable.js b/src/sunstone/public/app/tabs/files-tab/datatable.js index 3fe6354e82..1ebe7f048d 100644 --- a/src/sunstone/public/app/tabs/files-tab/datatable.js +++ b/src/sunstone/public/app/tabs/files-tab/datatable.js @@ -25,6 +25,7 @@ define(function(require) { var Humanize = require('utils/humanize'); var Notifier = require('utils/notifier'); var OpenNebulaImage = require('opennebula/image'); + var LabelsUtils = require('utils/labels/utils'); /* CONSTANTS @@ -33,6 +34,8 @@ define(function(require) { var RESOURCE = "File"; var XML_ROOT = "IMAGE"; var TAB_NAME = require('./tabId'); + var LABELS_COLUMN = 13; + var TEMPLATE_ATTR = 'TEMPLATE'; /* CONSTRUCTOR @@ -44,6 +47,7 @@ define(function(require) { this.dataTableId = dataTableId; this.resource = RESOURCE; this.xmlRoot = XML_ROOT; + this.labelsColumn = LABELS_COLUMN; this.dataTableOptions = { "bAutoWidth": false, @@ -70,6 +74,7 @@ define(function(require) { Locale.tr("Status"), Locale.tr("#VMS"), Locale.tr("Target"), + Locale.tr("Labels") ]; this.selectOptions = { @@ -119,7 +124,8 @@ define(function(require) { parseInt(element.PERSISTENT) ? "yes" : "no", OpenNebulaImage.stateStr(element.STATE), element.RUNNING_VMS, - element.TEMPLATE.TARGET ? element.TEMPLATE.TARGET : '--' + element.TEMPLATE.TARGET ? element.TEMPLATE.TARGET : '--', + (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'') ]; } });