shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-27 10:50:10 +03:00
Code Releases Wiki Activity

feature #4184: Add labels support to files-tab

Browse Source
This commit is contained in:
Daniel Molina 2015-12-17 17:39:26 +01:00 committed by Ruben S. Montero
parent 9412c94155
commit 1f79df30c0
5 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sunstone/etc/sunstone-views/admin.yaml
View File

@ -290,6 +290,7 @@ tabs:
- 10 # Status
#- 11 # #VMs
#- 12 # Target
#- 13 # Labels
actions:
File.refresh: true
File.create_dialog: true

1
src/sunstone/etc/sunstone-views/admin_vcenter.yaml
View File

@ -290,6 +290,7 @@ tabs:
- 10 # Status
#- 11 # #VMs
#- 12 # Target
#- 13 # Labels
actions:
File.refresh: true
File.create_dialog: true

1
src/sunstone/etc/sunstone-views/user.yaml
View File

@ -291,6 +291,7 @@ tabs:
- 10 # Status
#- 11 # #VMs
#- 12 # Target
#- 13 # Labels
actions:
File.refresh: true
File.create_dialog: true

1
src/sunstone/public/app/tabs/files-tab/actions.js
View File

@ -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'),

8
src/sunstone/public/app/tabs/files-tab/datatable.js
View File

@ -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])||'')
];
}
});