[savedObject] always attach an index pattern to searchSources

elastic · Oct 3, 2014 · aca2457 · aca2457
1 parent c00d86b
commit aca2457
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/kibana/components/courier/saved_object/saved_object.js b/src/kibana/components/courier/saved_object/saved_object.js
@@ -120,13 +120,6 @@ define(function (require) {
                 } catch (e) {}
                 obj.searchSource.set(state);
               }
-
-              if (_.isString(obj.searchSource.get('index'))) {
-                return indexPatterns.get(obj.searchSource.get('index'))
-                .then(function (indexPattern) {
-                  obj.searchSource.index(indexPattern);
-                });
-              }
             })
             .then(function () {
               return Promise.cast(afterESResp.call(obj, resp));
@@ -137,6 +130,14 @@ define(function (require) {
             });
           });
         })
+        .then(function () {
+          if (obj.searchSource) {
+            return indexPatterns.get(obj.searchSource.get('index'))
+            .then(function (indexPattern) {
+              obj.searchSource.index(indexPattern);
+            });
+          }
+        })
         .then(function () {
           return customInit.call(obj);
         })