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 
Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
(cherry picked from commit 559801d08bdbeb49ae2ed7051a992eca8fde45d8)
This commit is contained in:
Kristian Feldsam 2022-06-01 23:19:00 +02:00 committed by Tino Vazquez
parent 8d9a8ed965
commit b1917ce23a
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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