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 vms-tab

Browse Source
This commit is contained in:
Daniel Molina 2015-12-17 12:08:20 +01:00 committed by Ruben S. Montero
parent 41921bfcb4
commit 22adcb773f
5 changed files with 23 additions and 13 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

@ -158,6 +158,7 @@ tabs:
#- 10 # Start Time
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
actions:
VM.refresh: true
VM.create_dialog: true

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

@ -158,6 +158,7 @@ tabs:
#- 10 # Start Time
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
actions:
VM.refresh: true
VM.create_dialog: true

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

@ -159,6 +159,7 @@ tabs:
#- 10 # Start Time
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
actions:
VM.refresh: true
VM.create_dialog: true

2
src/sunstone/public/app/tabs/vms-tab/datatable.js
View File

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

31
src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
View File

@ -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) {
"",
"",
"",
"",
""
];
}