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

B #5856: Fix sunstone charters times on non-relative actions

Browse Source 
(cherry picked from commit c63fa9eab7b7db1d650b66b7153ac72046d1980b)
This commit is contained in:
Jorge Lobo 2022-06-16 09:25:38 +02:00 committed by Tino Vazquez
parent 67582dc990
commit fdd1e48512
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,10 +205,10 @@ define(function(require) {
!isNaN(parseInt(leases[action.ACTION].time)) &&
leases[action.ACTION].color
){
var endTime = action.TIME.startsWith("+")? action.TIME : action.TIME - startTime;
var endTime = (action.TIME.startsWith("+")? action.TIME : action.TIME - startTime).toString();
if(checkTime(startTime, endTime)){
rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:endTime.toString(), data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:endTime, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
if(
leases[action.ACTION].warning &&
leases[action.ACTION].warning.time &&

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

@ -173,10 +173,10 @@ define(function(require) {
!isNaN(parseInt(leases[action.ACTION].time)) &&
leases[action.ACTION].color
){
var endTime = action.TIME.startsWith("+")? action.TIME : action.TIME - startTime;
var endTime = (action.TIME.startsWith("+")? action.TIME : action.TIME - startTime).toString();
if(checkTime(element.STIME, endTime)){
rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:endTime.toString(), data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:endTime, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
if(
leases[action.ACTION].warning &&
leases[action.ACTION].warning.time &&