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:
scottashton 2014-03-05 16:46:00 +01:00
parent 28ef8d5d41 b1e4554a85
commit 437dc5a668
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/apps/system/aardvark/frontend/js/views/dashboardView.js
View File

@ -262,10 +262,13 @@
Object.keys(self.dygraphConfig.combinedCharts).forEach(function (cc) { Object.keys(self.dygraphConfig.combinedCharts).forEach(function (cc) {
var part = cc.split("_"); var part = cc.split("_");
var val = [new Date(time)]; var val = [new Date(time)];
self.dygraphConfig.combinedCharts[cc].sort().forEach(function(attrib) { self.dygraphConfig.combinedCharts[cc].sort().forEach(function(attrib) {
if (self.LastValues[attrib]) { if (self.LastValues[attrib]) {
val.push(self.LastValues[attrib].graphVal); val.push(self.LastValues[attrib].graphVal);
} else if (entry[part[0]] && entry[part[0]][attrib]) { }
else if (typeof entry[part[0]] === 'object' &&
entry[part[0]].hasOwnProperty(attrib)) {
val.push(entry[part[0]][attrib]); val.push(entry[part[0]][attrib]);
} }
}); });
@ -557,7 +560,6 @@
renderDistributionPlaceholder: function () { renderDistributionPlaceholder: function () {
var self = this; var self = this;
console.log(this);
_.each(this.dygraphConfig.chartTypeExceptions.distribution, function(k, v) { _.each(this.dygraphConfig.chartTypeExceptions.distribution, function(k, v) {
$(self.distributionChartDiv).append(self.distributionTemplate.render({ $(self.distributionChartDiv).append(self.distributionTemplate.render({
elementId: v + "Distribution" elementId: v + "Distribution"