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

Browse Source
This commit is contained in:
Daniel Molina 2015-12-17 13:14:13 +01:00 committed by Ruben S. Montero
parent f949ecfc03
commit 6cd572cd67
4 changed files with 11 additions and 2 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

@ -63,6 +63,7 @@ tabs:
- 7 # CPU
#- 8 # Group ID
#- 9 # Hidden User Data
#- 10 # Labels
actions:
User.refresh: true
User.create_dialog: true

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

@ -63,6 +63,7 @@ tabs:
- 7 # CPU
#- 8 # Group ID
#- 9 # Hidden User Data
#- 10 # Labels
actions:
User.refresh: true
User.create_dialog: true

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

@ -64,6 +64,7 @@ tabs:
- 7 # CPU
#- 8 # Group ID
#- 9 # Hidden User Data
#- 10 # Labels
actions:
User.refresh: true
User.create_dialog: true

10
src/sunstone/public/app/tabs/users-tab/datatable.js
View File

@ -25,6 +25,7 @@ define(function(require) {
var QuotaDefaults = require('utils/quotas/quota-defaults');
var QuotaWidgets = require('utils/quotas/quota-widgets');
var TemplateUtils = require('utils/template-utils');
var LabelsUtils = require('utils/labels/utils');
/*
CONSTANTS
@ -33,6 +34,8 @@ define(function(require) {
var RESOURCE = "User";
var XML_ROOT = "USER";
var TAB_NAME = require('./tabId');
var LABELS_COLUMN = 10;
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,
@ -67,7 +71,8 @@ define(function(require) {
Locale.tr("Memory"),
Locale.tr("CPU"),
Locale.tr("Group ID"),
Locale.tr("Hidden User Data")
Locale.tr("Hidden User Data"),
Locale.tr("Labels")
];
this.selectOptions = {
@ -141,7 +146,8 @@ define(function(require) {
memory,
cpu,
element.GID,
hidden_template
hidden_template,
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'')
];
}