diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
| commit | 4484a3197ca558341ce595df41ffdc072a8d05d2 (patch) | |
| tree | 160895b3cd052ef5a0661ed2ee02a53494dab207 /addons/board/static/src | |
| parent | 4387187b8bdac6223979e9a652b6ef6a19096804 (diff) | |
| parent | d0f5b28bd0da703e3d5a23cb68db91a6a87482dc (diff) | |
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
Diffstat (limited to 'addons/board/static/src')
| -rw-r--r-- | addons/board/static/src/js/dashboard.js | 6 | ||||
| -rw-r--r-- | addons/board/static/src/xml/board.xml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 0a38c744738..bd9625a4fa8 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -177,8 +177,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ view_mode = action_attrs.view_mode; // evaluate action_attrs context and domain + action_attrs.context_string = action_attrs.context; action_attrs.context = instance.web.pyeval.eval( 'context', action_attrs.context || {}); + action_attrs.domain_string = action_attrs.domain; action_attrs.domain = instance.web.pyeval.eval( 'domain', action_attrs.domain || [], action_attrs.context); if (action_attrs.context['dashboard_merge_domains_contexts'] === false) { @@ -301,9 +303,9 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ instance.web.form.DashBoardLegacy = instance.web.form.DashBoard.extend({ renderElement: function() { if (this.node.tag == 'hpaned') { - this.node.attrs.style = '2-1'; + this.node.attrs.layout = '2-1'; } else if (this.node.tag == 'vpaned') { - this.node.attrs.style = '1'; + this.node.attrs.layout = '1'; } this.node.tag = 'board'; _.each(this.node.children, function(child) { diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml index 03ede793036..9e1f15562a3 100644 --- a/addons/board/static/src/xml/board.xml +++ b/addons/board/static/src/xml/board.xml @@ -10,7 +10,7 @@ <span> Change Layout </span> </button> </div> - <table t-att-data-layout="node.attrs.style" t-attf-class="oe_dashboard oe_dashboard_layout_#{node.attrs.style}" cellspacing="0" cellpadding="0" border="0"> + <table t-att-data-layout="node.attrs.layout" t-attf-class="oe_dashboard oe_dashboard_layout_#{node.attrs.layout}" cellspacing="0" cellpadding="0" border="0"> <tr> <td t-foreach="node.children" t-as="column" t-if="column.tag == 'column'" t-att-id="view.element_id + '_column_' + column_index" t-attf-class="oe_dashboard_column index_#{column_index}"> |