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

[imp] now closes dialogs when using client actions 

bzr revid: nicolas.vanhoren@openerp.com-20111214170356-znxja2f0jekb63a9
This commit is contained in:
niv-openerp 2011-12-14 18:03:56 +01:00
parent 5eb0b2a10f
commit 91909f1927
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/chrome.js
View File

@ -663,7 +663,7 @@ openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# *
self.$content.remove();
if (!self.session.uid)
return;
var func = new openerp.web.Model(self.session, "res.users").get_func("read");
var func = new openerp.web.Model("res.users").get_func("read");
return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
self.$content = $(QWeb.render("Header-content", {widget: self, user: res}));
self.$content.appendTo(self.$element);

2
addons/web/static/src/js/data.js
View File

@ -811,7 +811,7 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
});
openerp.web.Model = openerp.web.CallbackEnabled.extend({
init: function(_, model_name) {
init: function(model_name) {
this._super();
this.model_name = model_name;
},

1
addons/web/static/src/js/views.js
View File

@ -152,6 +152,7 @@ session.web.ActionManager = session.web.Widget.extend({
},
ir_actions_client: function (action) {
this.content_stop();
this.dialog_stop();
var ClientWidget = session.web.client_actions.get_object(action.tag);
(this.client_widget = new ClientWidget(this, action.params)).appendTo(this);