From 36d47aebc1ba6f8c70fa0eaeb03e75b6989e2cc0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Mar 2013 15:00:15 +0100
Subject: [PATCH] [FIX] small problem with <button confirm="..."/>, didn't
 confirmed correctly when closing the popup

lp bug: https://launchpad.net/bugs/1095366 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130301140015-67av4zwrdhbh3srh
---
 addons/web/static/src/js/view_form.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index db67b1793b8..479d091d4db 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1916,18 +1916,20 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
                     modal: true,
                     buttons: [
                         {text: _t("Cancel"), click: function() {
-                                def.resolve();
                                 $(this).dialog("close");
                             }
                         },
                         {text: _t("Ok"), click: function() {
-                                self.on_confirmed().done(function() {
-                                    def.resolve();
+                                var self2 = this;
+                                self.on_confirmed().always(function() {
+                                    $(self2).dialog("close");
                                 });
-                                $(this).dialog("close");
                             }
-                        }
-                    ]
+                        },
+                    ],
+                    beforeClose: function() {
+                        def.resolve();
+                    },
                 });
                 return def.promise();
             } else {