From ec1316d3932aef6f81d02385b1a18febb1c5e07d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 1 Sep 2011 15:33:55 +0200 Subject: [PATCH] [IMP] inline additions to user prefs action before executing it bzr revid: xmo@openerp.com-20110901133355-4s73qsvy02agqiw1 --- addons/base/static/src/js/chrome.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index ff95c72d1e2..8f6e83db7a8 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -629,18 +629,19 @@ openerp.base.Header = openerp.base.Widget.extend({ var self = this; var action_manager = new openerp.base.ActionManager(this); var dataset = new openerp.base.DataSet (this,'res.users',this.context); - dataset.call ('action_get','',function (result){self.rpc('/base/action/load', {action_id:result}, function(result){ - var action = result['result']; - action['res_id'] = self.session.uid; - action['res_model']= 'res.users'; - action['view_id']=result['result']['views'][0][0]; - action['flags']['action_buttons']=false; - action['flags']['search_view']=false; - action['flags']['sidebar']=false; - action['view_mode']="form"; - action['flags']['views_switcher']=false; - action['flags']['pager']=false; - action_manager.do_action(action); + dataset.call ('action_get','',function (result){ + self.rpc('/base/action/load', {action_id:result}, function(result){ + action_manager.do_action(_.extend(result['result'], { + res_id: self.session.uid, + res_model: 'res.users', + flags: { + action_buttons: false, + search_view: false, + sidebar: false, + views_switcher: false, + pager: false + } + })); }); }); this.dialog = new openerp.base.Dialog(this,{