From c0cfdad7d18788f1bcf2a099c8d8991dafa01c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 12 Sep 2017 10:38:53 +0200 Subject: [PATCH] Use hasOwnProperty method to check if histogram is a time-series --- lib/cartodb/models/dataview/histogram.js | 2 +- lib/cartodb/models/dataview/histograms/numeric-histogram.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index ba69c303..affbbd25 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -42,7 +42,7 @@ module.exports = class Histogram { } _isDateHistogram (override = {}) { - return (this.options.aggregation !== undefined || override.aggregation !== undefined); + return (this.options.hasOwnProperty('aggregation') || override.hasOwnProperty('aggregation')); } getResult (psql, override, callback) { diff --git a/lib/cartodb/models/dataview/histograms/numeric-histogram.js b/lib/cartodb/models/dataview/histograms/numeric-histogram.js index 638d3f0a..1df88adb 100644 --- a/lib/cartodb/models/dataview/histograms/numeric-histogram.js +++ b/lib/cartodb/models/dataview/histograms/numeric-histogram.js @@ -64,7 +64,7 @@ const binsQueryTpl = ctx => ` ${ctx._maxBins} ) ) - END AS __cdb_bins_number + END AS __cdb_bins_number FROM __cdb_basics, __cdb_iqrange, __cdb_filtered_source LIMIT 1 )