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

F #5066: Add registration time to Services

Browse Source 
Signed-off-by: Frederick Borges <fborges@opennebula.io>
This commit is contained in:
Frederick Borges 2021-01-11 17:41:33 +01:00 committed by Tino Vázquez
parent d8f00ad769
commit 31eead1210
12 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sunstone/etc/sunstone-views/kvm/admin.yaml
View File

@ -475,8 +475,9 @@ tabs:
- 3 # Owner
- 4 # Group
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml
View File

@ -474,8 +474,9 @@ tabs:
#- 3 # Owner
- 4 # Group
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/kvm/user.yaml
View File

@ -467,8 +467,9 @@ tabs:
- 3 # Group
- 4 # Name
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/mixed/admin.yaml
View File

@ -475,8 +475,9 @@ tabs:
- 3 # Owner
- 4 # Group
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml
View File

@ -474,8 +474,9 @@ tabs:
#- 3 # Owner
- 4 # Group
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/mixed/user.yaml
View File

@ -467,8 +467,9 @@ tabs:
- 3 # Group
- 4 # Name
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/vcenter/admin.yaml
View File

@ -473,8 +473,9 @@ tabs:
- 3 # Owner
- 4 # Group
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml
View File

@ -474,8 +474,9 @@ tabs:
#- 3 # Owner
- 4 # Group
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

5
src/sunstone/etc/sunstone-views/vcenter/user.yaml
View File

@ -467,8 +467,9 @@ tabs:
- 3 # Group
- 4 # Name
- 5 # State
#- 6 # Labels
#- 7 # Search data
- 6 # Registration time
#- 7 # Labels
#- 8 # Search data
actions:
Service.refresh: true
Service.create_dialog: true

7
src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
View File

@ -26,6 +26,7 @@ define(function(require) {
var LabelsUtils = require('utils/labels/utils');
var SearchDropdown = require('hbs!./datatable/search');
var Status = require('utils/status');
var Humanize = require('utils/humanize');
/*
CONSTANTS
@ -34,8 +35,8 @@ define(function(require) {
var RESOURCE = "Service";
var XML_ROOT = "DOCUMENT";
var TAB_NAME = require('./tabId');
var LABELS_COLUMN = 6;
var SEARCH_COLUMN = 7;
var LABELS_COLUMN = 7;
var SEARCH_COLUMN = 8;
var TEMPLATE_ATTR = 'TEMPLATE';
/*
@ -69,6 +70,7 @@ define(function(require) {
Locale.tr("Group"),
Locale.tr("Name"),
Locale.tr("State"),
Locale.tr("Registration time"),
Locale.tr("Labels"),
"search_data"
];
@ -122,6 +124,7 @@ define(function(require) {
element.GNAME,
element.NAME,
state,
Humanize.prettyTime(element.TEMPLATE.BODY['registration_time']),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
btoa(unescape(encodeURIComponent(JSON.stringify(search))))
];

5
src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js
View File

@ -23,6 +23,7 @@ define(function(require) {
var RenameTr = require('utils/panel/rename-tr');
var PermissionsTable = require('utils/panel/permissions-table');
var OpenNebulaService = require('opennebula/service');
var Humanize = require('utils/humanize');
/*
TEMPLATES
@ -65,12 +66,14 @@ define(function(require) {
function _html() {
var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME);
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
var prettyRegTime = Humanize.prettyTime(this.element.TEMPLATE.BODY['registration_time']);
return TemplateHTML({
'element': this.element,
'renameTrHTML': renameTrHTML,
'permissionsTableHTML': permissionsTableHTML,
'stateStr': OpenNebulaService.stateStr(this.element.TEMPLATE.BODY.state)
'stateStr': OpenNebulaService.stateStr(this.element.TEMPLATE.BODY.state),
'prettyRegTime': prettyRegTime
});
}

5
src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/html.hbs
View File

@ -28,6 +28,11 @@
<td class="value_td" colspan="2">{{element.ID}}</td>
</tr>
{{{renameTrHTML}}}
<tr>
<td class="key_td">{{tr "Register time"}}</td>
<td class="value_td">{{prettyRegTime}}</td>
<td></td>
</tr>
<tr>
<td class="key_td">{{tr "Strategy"}}</td>
<td class="value_td">{{element.TEMPLATE.BODY.deployment}}</td>