[FIX] web: revert c1d48362d3a38606ffb99d569fdc6147dcd0c775 and consider there is...
authorDenis Ledoux <dle@odoo.com>
Fri, 10 Oct 2014 12:09:05 +0000 (14:09 +0200)
committerDenis Ledoux <dle@odoo.com>
Fri, 10 Oct 2014 12:09:05 +0000 (14:09 +0200)
addons/web/static/src/js/chrome.js
addons/web/static/src/js/views.js

index 08b3cf7..bbf3615 100644 (file)
@@ -172,7 +172,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         $dialog_content.openerpClass();
 
         this.$dialog_box.on('hidden.bs.modal', this, function() {
-            self.destroy();
+            self.close();
         });
         this.$dialog_box.modal('show');
 
index e62928f..739a36d 100644 (file)
@@ -410,7 +410,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }
         var widget = executor.widget();
         if (executor.action.target === 'new') {
-            var pre_dialog = this.dialog;
+            var pre_dialog = (this.dialog && !this.dialog.isDestroyed()) ? this.dialog : null;
             if (pre_dialog){
                 // prevent previous dialog to consider itself closed,
                 // right now, as we're opening a new one (prevents