Move whitelisted routes into an array

spalger · Dec 2, 2014 · 6a3015e · 6a3015e
1 parent c668e88
commit 6a3015e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/kibana/utils/routes/_setup.js b/src/kibana/utils/routes/_setup.js
@@ -1,5 +1,6 @@
 define(function (require) {
   return function routeSetup(Promise, kbnSetup, config, $route, kbnUrl, courier, Notifier, Private, $rootScope) {
+    var _ = require('lodash');
     var errors = require('errors');
     var NoDefaultIndexPattern = errors.NoDefaultIndexPattern;
     var NoDefinedIndexPatterns = errors.NoDefinedIndexPatterns;
@@ -17,7 +18,13 @@ define(function (require) {
         ])
         .then(function () {
           var path = $route.current.$$route.originalPath;
-          if (!path.match(/settings\/indices/) && !path.match(/settings\/about/)) {
+          var allowedRoutes = [
+            'settings/indices',
+            'settings/about'
+          ];
+          if (!_.find(allowedRoutes, function (route) {
+            return path.indexOf(route) >= 0;
+          })) {
             return courier.indexPatterns.getIds()
             .then(function (patterns) {
               if (!config.get('defaultIndex')) {