github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update default to string, remove check for getFormat in aggConfig

Browse source
This commit is contained in:
Rashid Khan 2015-05-06 15:58:04 -07:00
parent a5449701c3
commit 37e561c5a2
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kibana/components/agg_types/_agg_type.js
View file

@ -133,7 +133,7 @@ define(function (require) {
*/
AggType.prototype.getFormat = function (agg) {
var field = agg.field();
return field ? field.format : fieldFormats.getDefaultInstance('number');
return field ? field.format : fieldFormats.getDefaultInstance('string');
};
return AggType;

2
src/kibana/components/vis/_agg_config.js
View file

@ -272,7 +272,7 @@ define(function (require) {
var format = field && field.format;
var strFormat = fieldFormats.getDefaultInstance('string');
if (this.type && this.type.getFormat) {
if (this.type) {
format = this.type.getFormat(this) || format;
}

2
test/unit/specs/components/agg_types/_agg_type.js
View file

@ -102,7 +102,7 @@ define(function (require) {
});
aggConfig = vis.aggs.byTypeName.count[0];
expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('number'));
expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('string'));
});
it('can be overridden via config', function () {