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

corrected rebase on master

Browse source
This commit is contained in:
Stéphane Campinas 2016-06-02 22:29:19 +01:00
parent dc53a103bc
commit 4be31b2878
3 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test_utils/stub_index_pattern.js
View file

@ -20,6 +20,7 @@ export default function (Private) {
this.timeFieldName = timeField;
this.getNonScriptedFields = sinon.spy();
this.getScriptedFields = sinon.spy();
this.getSourceFiltering = sinon.spy();
this.metaFields = ['_id', '_type', '_source'];
this.fieldFormatMap = {};
this.routes = IndexPattern.prototype.routes;

1
src/ui/public/index_patterns/_field.js
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
import ObjDefine from 'ui/utils/obj_define';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';

20
src/ui/public/index_patterns/_index_pattern.js
View file

@ -123,23 +123,6 @@ export default function IndexPatternFactory(Private, timefilter, Notifier, confi
});
};
// Set the source filtering configuration for that index
self.setSourceFiltering = function (config) {
self.sourceFiltering = config;
self.save();
};
// Get the source filtering configuration for that index.
// Fields which name appears in the given columns array will not be excluded.
self.getSourceFiltering = function (columns) {
return {
exclude: _(self.getNonScriptedFields())
.filter((field) => field.exclude && !_.contains(columns, field.name))
.map((field) => field.name)
.value()
};
};
function initFields(fields) {
self.fields = new FieldList(self, fields || self.fields || []);
}
@ -371,8 +354,7 @@ export default function IndexPatternFactory(Private, timefilter, Notifier, confi
edit: '/settings/indices/{{id}}',
addField: '/settings/indices/{{id}}/create-field',
indexedFields: '/settings/indices/{{id}}?_a=(tab:indexedFields)',
scriptedFields: '/settings/indices/{{id}}?_a=(tab:scriptedFields)',
sourceFiltering: '/settings/indices/{{id}}?_a=(tab:sourceFiltering)'
scriptedFields: '/settings/indices/{{id}}?_a=(tab:scriptedFields)'
};
return IndexPattern;