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

B #5340: Fix start time on services without registration time (#1174)

Browse Source 
Signed-off-by: Frederick Borges <fborges@opennebula.io>
(cherry picked from commit 37a8d3b4f41e03770fceb81f119ea0680bbb190f)
This commit is contained in:
Frederick Borges 2021-04-30 19:47:50 +02:00 committed by Tino Vazquez
parent 714e075b76
commit 551fbe312c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ define(function(require) {
element.GNAME,
element.NAME,
state,
Humanize.prettyTime(element.TEMPLATE.BODY["registration_time"]),
Humanize.prettyTime(element.TEMPLATE.BODY["start_time"]),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||""),
leasesClock(element),
btoa(unescape(encodeURIComponent(JSON.stringify(search))))

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

@ -66,14 +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']);
var prettyStartTime = Humanize.prettyTime(this.element.TEMPLATE.BODY['start_time']);
return TemplateHTML({
'element': this.element,
'renameTrHTML': renameTrHTML,
'permissionsTableHTML': permissionsTableHTML,
'stateStr': OpenNebulaService.stateStr(this.element.TEMPLATE.BODY.state),
'prettyRegTime': prettyRegTime
'prettyStartTime': prettyStartTime
});
}

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

@ -30,7 +30,7 @@
{{{renameTrHTML}}}
<tr>
<td class="key_td">{{tr "Start time"}}</td>
<td class="value_td">{{prettyRegTime}}</td>
<td class="value_td">{{prettyStartTime}}</td>
<td></td>
</tr>
<tr>