diff options
| author | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-10-19 10:41:49 +0530 |
|---|---|---|
| committer | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-10-19 10:41:49 +0530 |
| commit | d6c2e9bab3961d9a03ec1cda4882dabdb2b8bae8 (patch) | |
| tree | 51037a620aae0ee593e770c9b0c1ec70de637a19 /addons/process/static/src | |
| parent | 65ff8505bd3e83642c792690dff013035a435694 (diff) | |
| parent | c4104503d6fe739a643f95efa68df36f3c069e0e (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121015090323-g8j26cfbl4gyha46
bzr revid: mma@tinyerp.com-20121016052743-qvjgo91na06spnm5
bzr revid: mma@tinyerp.com-20121018053009-tl3gqv20z8522msh
bzr revid: mma@tinyerp.com-20121019051149-5iv88r8pr2xpizur
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); }) |