Merge pull request #2267 from spenceralger/allow_settings_without_def…

…ault_index_pattern LGTM Allow navigating throughout settings without having a default index pattern
elastic · Dec 12, 2014 · 03e38a1 · 03e38a1
2 parents 728863a + 5a14b98
commit 03e38a1
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/kibana/utils/routes/_setup.js b/src/kibana/utils/routes/_setup.js
@@ -6,6 +6,7 @@ define(function (require) {
     var firstNoDefaultError = true;
 
     var rootSearchSource = Private(require('components/courier/data_source/_root_search_source'));
+    var allowedRoutesRE = /^\/settings\//;
 
     return {
       routeSetupWork: function () {
@@ -17,11 +18,7 @@ define(function (require) {
         ])
         .then(function () {
           var path = $route.current.$$route.originalPath;
-          var allowedRoutes = [
-            '/settings/indices/',
-            '/settings/about'
-          ];
-          if (allowedRoutes.indexOf(path) < 0) {
+          if (!path.match(allowedRoutesRE)) {
             return courier.indexPatterns.getIds()
             .then(function (patterns) {
               if (!config.get('defaultIndex')) {