set the default index when deleting the default and when creating the…

… first. Closes #98
elastic · May 31, 2014 · 225391a · 225391a
1 parent 915c31e
commit 225391a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/kibana/apps/settings/directives/indices/create.js b/src/kibana/apps/settings/directives/indices/create.js
@@ -8,7 +8,7 @@ define(function (require) {
   });
 
   require('modules').get('app/settings')
-  .controller('kbnSettingsIndicesCreate', function ($scope, $location, Notifier, Private, indexPatterns, es) {
+  .controller('kbnSettingsIndicesCreate', function ($scope, $location, Notifier, Private, indexPatterns, es, config) {
     var notify = new Notifier();
     var refreshKibanaIndex = Private(require('./_refresh_kibana_index'));
     var MissingIndices = errors.IndexPatternMissingIndices;
@@ -140,6 +140,9 @@ define(function (require) {
         return indexPattern.refreshFields()
         .then(refreshKibanaIndex)
         .then(function () {
+          if (!config.get('defaultIndex')) {
+            config.set('defaultIndex', indexPattern.id);
+          }
           indexPatterns.cache.clear(indexPattern.id);
           $location.url('/settings/indices/' + indexPattern.id);
         });

diff --git a/src/kibana/apps/settings/directives/indices/edit.js b/src/kibana/apps/settings/directives/indices/edit.js
@@ -1,4 +1,7 @@
 define(function (require) {
+  var _ = require('lodash');
+  var module = require('modules').get('app/settings');
+
   require('routes')
   .when('/settings/indices/:id', {
     template: require('text!../../partials/indices/edit.html'),
@@ -10,12 +13,13 @@ define(function (require) {
     }
   });
 
-  require('modules').get('app/settings')
-  .controller('kbnSettingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private) {
+  module.controller('kbnSettingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private) {
     var notify = new Notifier();
     var refreshKibanaIndex = Private(require('./_refresh_kibana_index'));
 
     $scope.indexPattern = $route.current.locals.indexPattern;
+    var otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);
+
     $scope.table = {
       by: 'name',
       reverse: false,
@@ -30,6 +34,9 @@ define(function (require) {
     $scope.removePattern = function () {
       if ($scope.indexPattern.id === config.get('defaultIndex')) {
         config.delete('defaultIndex');
+        if (otherIds.length) {
+          config.set('defaultIndex', otherIds[0]);
+        }
       }
 
       courier.indexPatterns.delete($scope.indexPattern)