From 617d9395bca1c1dbd7ca7394e5299a9de620924a Mon Sep 17 00:00:00 2001 From: Jorge Lobo <47326048+jloboescalona2@users.noreply.github.com> Date: Wed, 22 Apr 2020 14:38:04 +0200 Subject: [PATCH] M #~: fix VM charter time (#4581) Signed-off-by: Jorge Lobo --- .../app/tabs/vms-tab/utils/datatable-common.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js index 62642be64b..99c2a46a56 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js @@ -118,16 +118,21 @@ define(function(require) { if( action && action.ACTION && + action.TIME && leases && - leases[action.ACTION] && - leases[action.ACTION].time && - !isNaN(parseInt(leases[action.ACTION].time)) && + leases[action.ACTION] && + leases[action.ACTION].time && + !isNaN(parseInt(leases[action.ACTION].time)) && leases[action.ACTION].color ){ - if(checkTime(element.STIME, leases[action.ACTION].time)){ + if(checkTime(element.STIME, action.TIME)){ rtn = $("",{class:"fa fa-clock"}).css("color",leases[action.ACTION].color); - if(leases[action.ACTION].warning && leases[action.ACTION].warning.time && leases[action.ACTION].warning.color){ - if(checkTime(element.STIME, leases[action.ACTION].time, leases[action.ACTION].warning.time)){ + if( + leases[action.ACTION].warning && + leases[action.ACTION].warning.time && + leases[action.ACTION].warning.color + ){ + if(checkTime(element.STIME, action.TIME, leases[action.ACTION].warning.time)){ rtn.css("color", leases[action.ACTION].warning.color); } }