display mapping conflict errors to the user, fixed #79

elastic · May 2, 2014 · 35c3b61 · 35c3b61
1 parent 6c7064d
commit 35c3b61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/kibana/apps/settings/controllers/indices.js b/src/kibana/apps/settings/controllers/indices.js
@@ -58,13 +58,21 @@ define(function (require) {
 
       // refresh the fields, to verify that the
       $scope.indexPattern.refreshFields()
-      .then(refreshKibanaIndex)
-      .then(function () {
-        $location.path('/settings/indices/' + $scope.indexPattern.id);
-      })
       .catch(function (err) {
-        if (err.status >= 400) notify.error('Could not locate any indices matching that pattern. Please add the index to Elasticsearch');
-        else notify.fatal(err);
+        notify.error(err);
+        delete $scope.indexPattern.id;
+        // rethrow to prevent second branch
+        throw err;
+      })
+      .then(function () {
+        refreshKibanaIndex()
+        .then(function () {
+          $location.path('/settings/indices/' + $scope.indexPattern.id);
+        })
+        .catch(function (err) {
+          if (err.status >= 400) notify.error('Could not locate any indices matching that pattern. Please add the index to Elasticsearch');
+          else notify.fatal(err);
+        });
       });
     };
 

diff --git a/src/kibana/components/courier/_errors.js b/src/kibana/components/courier/_errors.js
@@ -87,7 +87,7 @@ define(function (require) {
      */
     errors.MappingConflict = function MappingConflict(field) {
       CourierError.call(this,
-        'Field ' + field + ' is defined as at least two different types in indices matching the pattern',
+        'Field "' + field + '" is defined with at least two different types in indices matching the pattern',
         errors.MappingConflict);
     };
     inherits(errors.MappingConflict, CourierError);