corrected rebase on master

airow · Jun 2, 2016 · 4be31b2 · 4be31b2
1 parent dc53a10
commit 4be31b2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/src/test_utils/stub_index_pattern.js b/src/test_utils/stub_index_pattern.js
@@ -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;

diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js
@@ -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';

diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js
@@ -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;