odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
niv-openerp 2013-03-01 15:00:15 +01:00
parent de33121644
commit 36d47aebc1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web/static/src/js/view_form.js
View File

@ -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 {