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

Browse Source
This commit is contained in:
Daniel Molina 2015-12-17 17:45:59 +01:00 committed by Ruben S. Montero
parent 6c52333115
commit a6b6e469a9
4 changed files with 13 additions and 3 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

@ -346,6 +346,7 @@ tabs:
#- 10 # IM MAD
#- 11 # VM MAD
#- 12 # Last monitored on
#- 13 # Labels
actions:
Host.refresh: true
Host.create_dialog: true

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

@ -346,6 +346,7 @@ tabs:
#- 10 # IM MAD
#- 11 # VM MAD
#- 12 # Last monitored on
#- 13 # Labels
actions:
Host.refresh: true
Host.create_dialog: true

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

@ -347,6 +347,7 @@ tabs:
#- 10 # IM MAD
#- 11 # VM MAD
#- 12 # Last monitored on
#- 13 # Labels
actions:
Host.refresh: true
Host.create_dialog: true

13
src/sunstone/public/app/tabs/hosts-tab/datatable.js
View File

@ -25,7 +25,9 @@ define(function(require) {
var Humanize = require('utils/humanize');
var CPUBars = require('./utils/cpu-bars');
var MemoryBars = require('./utils/memory-bars');
var OpenNebulaHost = require('opennebula/host')
var OpenNebulaHost = require('opennebula/host');
var LabelsUtils = require('utils/labels/utils');
/*
CONSTANTS
@ -34,6 +36,8 @@ define(function(require) {
var RESOURCE = "Host";
var XML_ROOT = "HOST";
var TAB_NAME = require('./tabId');
var LABELS_COLUMN = 13;
var TEMPLATE_ATTR = 'TEMPLATE';
/*
CONSTRUCTOR
@ -45,6 +49,7 @@ define(function(require) {
this.dataTableId = dataTableId;
this.resource = RESOURCE;
this.xmlRoot = XML_ROOT;
this.labelsColumn = LABELS_COLUMN;
this.dataTableOptions = {
"bAutoWidth": false,
@ -70,7 +75,8 @@ define(function(require) {
Locale.tr("Status"),
Locale.tr("IM MAD"),
Locale.tr("VM MAD"),
Locale.tr("Last monitored on")
Locale.tr("Last monitored on"),
Locale.tr("Labels")
];
this.selectOptions = {
@ -157,7 +163,8 @@ define(function(require) {
OpenNebulaHost.simpleStateStr(element.STATE),
element.IM_MAD,
element.VM_MAD,
Humanize.prettyTime(element.LAST_MON_TIME)
Humanize.prettyTime(element.LAST_MON_TIME),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'')
];
}