From da8f2c342872bddda082dc7098c554c84e64a724 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Wed, 12 Oct 2016 20:05:22 -0400 Subject: [PATCH] Backport PR #8646 --------- **Commit 1:** Fix label on scripted field date histograms Now that we support Painless scripted fields users can create scripted date fields, and thus scripted date histograms. The label making method for the date histogram agg was getting the field name in a way that was incompatible with scripted fields, so I've added some fallback code for that scenario. I looked through the rest of the makeLabel methods on all the other aggs and they all correctly access the field displayName already so this should only need fixed for date histograms. Now with more lodash for safer access Fixes elastic#8632 * Original sha: fc635bcf2f110f251eb789c13a2dcddcf1f4e986 * Authored by Matthew Bargar on 2016-10-12T22:30:15Z --- src/ui/public/agg_types/buckets/date_histogram.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js index d99562e117221..03bf6aa3f9b05 100644 --- a/src/ui/public/agg_types/buckets/date_histogram.js +++ b/src/ui/public/agg_types/buckets/date_histogram.js @@ -41,7 +41,7 @@ export default function DateHistogramAggType(timefilter, config, Private) { makeLabel: function (agg) { const output = this.params.write(agg); const params = output.params; - const field = params.field || agg.params.field.displayName || ''; + const field = params.field || _.get(agg, 'params.field.displayName', ''); return field + ' per ' + (output.metricScaleText || output.bucketInterval.description); }, createFilter: createFilter,