diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js index 91d2b842f8a..69f06356127 100644 --- a/addons/edi/static/src/js/edi.js +++ b/addons/edi/static/src/js/edi.js @@ -39,16 +39,15 @@ instance.edi.EdiImport = instance.web.Widget.extend({ }); } else { - $('
').dialog({ - modal: true, - title: 'Import Successful!', - buttons: { - Ok: function() { - $(this).dialog("close"); - window.location = "/"; + new instance.web.Dialog(this,{ + title: 'Import Successful!', + buttons: { + Ok: function() { + this.parents('.modal').modal('hide'); + window.location = "/"; + } } - } - }).html(_t('The document has been successfully imported!')); + },$('
').html(_t('The document has been successfully imported!'))).open(); } }, on_imported_error: function(response){ @@ -58,13 +57,12 @@ instance.edi.EdiImport = instance.web.Widget.extend({ msg += "\n " + _t("Reason:") + response.data.message; } var params = {error: response, message: msg}; - $(instance.web.qweb.render("CrashManager.warning", params)).dialog({ - title: _t("Document Import Notification"), - modal: true, - buttons: { - Ok: function() { $(this).dialog("close"); } - } - }); + new instance.web.Dialog(this,{ + title: _t("Document Import Notification"), + buttons: { + Ok: function() { this.parents('.modal').modal('hide');} + } + },$(instance.web.qweb.render("CrashManager.warning", params))).open(); } }); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index db4056167a7..5e5d39203a6 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -779,9 +779,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ }); var am = instance.webclient.action_manager; var form = am.dialog_widget.views.form.controller; - form.on("on_button_cancel", am.dialog, am.dialog.close); + form.on("on_button_cancel", am.dialog, function() { return am.dialog.$dialog_box.modal('hide'); }); form.on('record_saved', self, function() { - am.dialog.close(); + am.dialog.$dialog_box.modal('hide'); self.view.do_reload(); }); },