diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-23 19:34:50 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-23 19:34:50 +0200 |
| commit | 07fb6d88b9c0ca87545735c83afc8f271db090dd (patch) | |
| tree | 62f48db8d70ddacffe868f05cb19590776b2203a /addons/web_dashboard/static/src | |
| parent | ac5dc58367d9bed5a576baaa7b803a67b5d00d07 (diff) | |
| parent | 8df25dc6830c1878931b7848dbf8a9be6a2d0515 (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20120723173450-2yxayvyoiiiw9tcw
Diffstat (limited to 'addons/web_dashboard/static/src')
| -rw-r--r-- | addons/web_dashboard/static/src/js/dashboard.js | 17 | ||||
| -rw-r--r-- | addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 651c3808c2f..a19151af33c 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ delete(action.attrs.width); delete(action.attrs.height); delete(action.attrs.colspan); - self.rpc('/web/action/load', { - action_id: parseInt(action.attrs.name, 10) - }, function(result) { - self.on_load_action(result, column_index + '_' + action_index, action.attrs); - }); + var action_id = _.str.toNumber(action.attrs.name); + if (!_.isNaN(action_id)) { + self.rpc('/web/action/load', {action_id: action_id}, function(result) { + self.on_load_action(result, column_index + '_' + action_index, action.attrs); + }); + } }); }); }, @@ -209,8 +210,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ } }); } - if (am.inner_viewmanager) { - am.inner_viewmanager.on_mode_switch.add(function(mode) { + if (am.inner_widget) { + am.inner_widget.on_mode_switch.add(function(mode) { var new_views = []; _.each(action_orig.views, function(view) { new_views[view[1] === mode ? 'unshift' : 'push'](view); @@ -219,7 +220,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ new_views.unshift([false, mode]); } action_orig.views = new_views; - action_orig.res_id = am.inner_viewmanager.dataset.ids[am.inner_viewmanager.dataset.index]; + action_orig.res_id = am.inner_widget.dataset.ids[am.inner_widget.dataset.index]; self.do_action(action_orig); }); } diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 5ca2551255c..68dda7d7f67 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -48,7 +48,7 @@ </div> </t> <t t-name="DashBoard.xml"> - <form t-att-string="form_title"> + <form t-att-string="form_title" version="7.0"> <board t-att-style="style"> <column t-foreach="columns" t-as="column"> <action t-foreach="column" t-as="action" t-att="action"/> |