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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-17 12:02:07 +02:00
parent 2b68d83072 79852a79d0
commit 22bd5740ee
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/apps/system/aardvark/frontend/js/collections/arangoDocuments.js
View File

@ -159,7 +159,7 @@
"count": this.getPageSize() "count": this.getPageSize()
}; };
query = "FOR x in @@collection"; query = "FOR x in @@collection let att = slice(ATTRIBUTES(x), 0, 10)";
query += this.setFiltersForQuery(bindVars); query += this.setFiltersForQuery(bindVars);
// Sort result, only useful for a small number of docs // Sort result, only useful for a small number of docs
if (this.getTotal() < this.MAX_SORT) { if (this.getTotal() < this.MAX_SORT) {
@ -173,14 +173,14 @@
} }
if (bindVars.count !== 'all') { if (bindVars.count !== 'all') {
query += " LIMIT @offset, @count RETURN x"; query += " LIMIT @offset, @count RETURN keep(x, att)";
} }
else { else {
tmp = { tmp = {
"@collection": this.collectionID "@collection": this.collectionID
}; };
bindVars = tmp; bindVars = tmp;
query += " RETURN x"; query += " RETURN keep(x, att)";
} }
queryObj = { queryObj = {

15
js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
View File

@ -106,7 +106,20 @@
visibility: [true, false], visibility: [true, false],
labels: ["datetime", "Major Page", "Minor Page"], labels: ["datetime", "Major Page", "Minor Page"],
div: "pageFaultsChart", div: "pageFaultsChart",
labelsKMG2: false labelsKMG2: false,
axes: {
y: {
valueFormatter: function (y) {
return parseFloat(y.toPrecision(3));
},
axisLabelFormatter: function (y) {
if (y === 0) {
return 0;
}
return parseFloat(y.toPrecision(3));
}
}
}
}, },
systemUserTime: { systemUserTime: {