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

feature #3345: Set Date.now as max for accounting

Browse Source
This commit is contained in:
Daniel Molina 2015-01-20 11:57:56 +01:00
parent 9ddae9673b
commit 8216b97ff3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/public/js/sunstone.js
View File

@ -5399,10 +5399,16 @@ function fillAccounting(div, req, response, no_table) {
var start = new Date(options.start_time * 1000);
start.setUTCHours(0,0,0,0);
var end = new Date();
var end;
var now = new Date();
if(options.end_time != undefined && options.end_time != -1){
var end = new Date(options.end_time * 1000)
if (options.end_time != undefined && options.end_time != -1) {
end = new Date(options.end_time * 1000)
if (end > now) {
end = now;
}
} else {
end = now;
}
// granularity of 1 day
@ -5419,6 +5425,10 @@ function fillAccounting(div, req, response, no_table) {
tmp_time.setUTCDate( tmp_time.getUTCDate() + 1 );
}
if (tmp_time > now) {
times.push(now.getTime());
}
//--------------------------------------------------------------------------
// Flot options
//--------------------------------------------------------------------------