diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-10-22 11:32:08 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-10-22 11:32:08 +0530 |
| commit | 87362b51688800dffcb5cc320eb3874be3ea7b9a (patch) | |
| tree | 0a5c9195d34423c0cff923a323c1f6fd1839d105 /addons/process/static/src | |
| parent | 0626542e585f1a687d1a84ba501759cbfe744e21 (diff) | |
| parent | f6722a220cbf2ca9ff3ed6ecf418e99b91522e06 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121016054150-3wk2tozq98u83kuk
bzr revid: jra@tinyerp.com-20121018060228-4th3uexqp9cks3xx
bzr revid: jra@tinyerp.com-20121019055038-pr1jz3u01hi0qjfq
bzr revid: jra@tinyerp.com-20121022060208-5fd962drv61gnu2j
Diffstat (limited to 'addons/process/static/src')
| -rw-r--r-- | addons/process/static/src/css/process.css | 2 | ||||
| -rw-r--r-- | addons/process/static/src/js/process.js | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/addons/process/static/src/css/process.css b/addons/process/static/src/css/process.css index 7442db9bc4a..5f438622653 100644 --- a/addons/process/static/src/css/process.css +++ b/addons/process/static/src/css/process.css @@ -44,7 +44,7 @@ a.cta-a strong { background-color:#FFF; } .process_canvas svg{ - height:500px;!important; + height:500px; padding:15px; } .oe_process { diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js index 386a9653c02..c214dbb0fdf 100644 --- a/addons/process/static/src/js/process.js +++ b/addons/process/static/src/js/process.js @@ -216,13 +216,12 @@ instance.web.ViewManager.include({ var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context); var action_manager = new instance.web.ActionManager(self); dataset.call('get', - ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context], - function(res) { + ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) { var action = res[0][res[0].length - 1]; self.rpc("/web/action/load", { action_id: action.id, context: dataset.context - }, function(result) { + }).then(function(result) { action_manager.replace(self.$el); action_manager.do_action(result.result); }) |