maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5418 from epixa/5417-safeconfirm

Browse source 
Use safeConfirm when overwriting index patterns
This commit is contained in:
Court Ewing 2015-11-17 13:49:18 -05:00
parent d0982a3021 ab307f0ccc
commit 01b6ff4592
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ui/public/index_patterns/_index_pattern.js
View file

@ -1,5 +1,5 @@
define(function (require) {
return function IndexPatternFactory(Private, timefilter, Notifier, config, kbnIndex, Promise, $rootScope) {
return function IndexPatternFactory(Private, timefilter, Notifier, config, kbnIndex, Promise, $rootScope, safeConfirm) {
var _ = require('lodash');
var errors = require('ui/errors');
var angular = require('angular');
@ -231,9 +231,15 @@ define(function (require) {
return docSource.doCreate(body)
.then(setId)
.catch(function (err) {
var confirmMessage = 'Are you sure you want to overwrite this?';
if (_.get(err, 'origError.status') === 409 && window.confirm(confirmMessage)) { // eslint-disable-line no-alert
return docSource.doIndex(body).then(setId);
if (_.get(err, 'origError.status') === 409) {
var confirmMessage = 'Are you sure you want to overwrite this?';
return safeConfirm(confirmMessage).then(
function () {
return docSource.doIndex(body).then(setId);
},
_.constant(false) // if the user doesn't overwrite, resolve with false
);
}
return Promise.resolve(false);
});