Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] merge action's and action_attrs' 

domains/contexts
pull/163/head
Holger Brunn 2015-07-02 14:56:54 +02:00
parent c78b2f40dc
commit d028da1058
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web_dashboard_open_action/static/src/js/web_dashboard_open_action.js
View File

@ -26,11 +26,12 @@ openerp.web_dashboard_open_action = function(instance)
{ {
var self = this, action = _.extend({flags: {}}, result); var self = this, action = _.extend({flags: {}}, result);
action.context_string = action_attrs.context; action.context_string = action_attrs.context;
action.context = instance.web.pyeval.eval(
'context', action_attrs.context || {});
action.domain_string = action_attrs.domain; action.domain_string = action_attrs.domain;
action.context = instance.web.pyeval.eval(
'contexts', [action.context || {}, action_attrs.context || {}]);
action.domain = instance.web.pyeval.eval( action.domain = instance.web.pyeval.eval(
'domain', action_attrs.domain || [], action_attrs.context); 'domains', [action_attrs.domain || [], action.domain || []],
action.context);
jQuery('#' + this.view.element_id + '_action_' + index) jQuery('#' + this.view.element_id + '_action_' + index)
.parent() .parent()
.find('.oe_web_dashboard_open_action') .find('.oe_web_dashboard_open_action')