Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

logs bugfix

This commit is contained in:
Heiko Kernbach 2014-05-16 12:58:25 +02:00
parent fc8003b4d7
commit 4cb82ee0b1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/apps/system/aardvark/frontend/js/collections/arangoLogs.js
View File

@ -7,6 +7,7 @@
window.ArangoLogs = window.PaginatedCollection.extend({ window.ArangoLogs = window.PaginatedCollection.extend({
upto: false, upto: false,
loglevel: 0, loglevel: 0,
totalPages: 0,
parse: function(response) { parse: function(response) {
var myResponse = []; var myResponse = [];
@ -20,6 +21,7 @@
}); });
}); });
this.totalAmount = response.totalAmount; this.totalAmount = response.totalAmount;
this.totalPages = Math.ceil(this.totalAmount / this.pagesize);
return myResponse; return myResponse;
}, },
@ -35,8 +37,9 @@
url: function() { url: function() {
var type, rtnStr, offset, size; var type, rtnStr, offset, size;
offset = this.page * this.pagesize; offset = this.page * this.pagesize;
var inverseOffset = this.totalAmount % this.pagesize - (this.pagesize * this.page); //var inverseOffset = this.totalAmount - (this.totalAmount % this.pagesize) - (this.pagesize * this.page);
if (inverseOffset < 0) { var inverseOffset = this.totalAmount - ((this.page + 1) * this.pagesize);
if (inverseOffset < 0 && this.page === (this.totalPages - 1)) {
inverseOffset = 0; inverseOffset = 0;
size = (this.totalAmount % this.pagesize); size = (this.totalAmount % this.pagesize);
} }
@ -44,6 +47,7 @@
size = this.pagesize; size = this.pagesize;
} }
//if totalAmount (first fetch) = 0, then set size to 1 (reduce traffic)
if (this.totalAmount === 0) { if (this.totalAmount === 0) {
size = 1; size = 1;
} }