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

return the indexPatternList along with the savedSearch in discover

Browse source
This commit is contained in:
Spencer Alger 2014-06-17 09:30:37 -07:00
parent 8e56864356
commit 7eb7322145
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kibana/apps/discover/controllers/discover.js
View file

@ -34,13 +34,13 @@ define(function (require) {
templateUrl: 'kibana/apps/discover/index.html',
reloadOnSearch: false,
resolve: {
savedSearch: function (savedSearches, $route, $location, Notifier, courier, indexPatterns) {
savedSearchAndIndexList: function (savedSearches, $route, $location, Notifier, courier, indexPatterns) {
return savedSearches.get($route.current.params.id)
.then(function (savedSearch) {
return indexPatterns.getIds()
.then(indexPatterns.ensureSome())
.then(function () {
return savedSearch;
.then(function (indexPatterns) {
return [savedSearch, indexPatterns];
});
})
.catch(courier.redirectWhenMissing({
@ -60,11 +60,11 @@ define(function (require) {
});
// the saved savedSearch
var savedSearch = $route.current.locals.savedSearch;
var savedSearch = $route.current.locals.savedSearchAndIndexList[0];
$scope.$on('$destroy', savedSearch.destroy);
// list of indexPattern id's
var indexPatternList = $route.current.locals.indexPatternList;
var indexPatternList = $route.current.locals.savedSearchAndIndexList[1];
// the actual courier.SearchSource
var searchSource = savedSearch.searchSource;