summaryrefslogtreecommitdiff
path: root/addons/share/web/controllers.py
diff options
context:
space:
mode:
authorHarry (OpenERP) <hmo@tinyerp.com>2011-03-01 11:25:53 +0530
committerHarry (OpenERP) <hmo@tinyerp.com>2011-03-01 11:25:53 +0530
commitec73645c4c7d4b160d54156b0e1f10c514e5dfc8 (patch)
tree972538df4d46d82688c2853477efe9c6bc1672e9 /addons/share/web/controllers.py
parent35df09c02820dc3486009b8cf5a88e9c9285ae89 (diff)
parent9c7afeb2c8bbe904435d132736e95f7a354c801b (diff)
[MERGE] merged trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110228075715-o0wm18nhd910aubc bzr revid: hmo@tinyerp.com-20110301055553-adkdzxqxj1fcroh6
Diffstat (limited to 'addons/share/web/controllers.py')
-rw-r--r--addons/share/web/controllers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index bac7a607cf0..4b723f225da 100644
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -17,7 +17,7 @@ class ShareWizardController(openerp.controllers.SecuredController):
if not action_id:
# This should not be needed anymore, but just in case users are
- # running the module with an order version of the web client...
+ # running the module with an older version of the web client...
# to remove soon-ish
action_id = rpc.RPCProxy('ir.actions.act_window').search(
@@ -44,7 +44,7 @@ class ShareWizardController(openerp.controllers.SecuredController):
Share = rpc.RPCProxy('share.wizard')
sharing_view_id = Share.create({
'domain': str(domain),
- 'action_id':action_id
+ 'action_id': action_id and int(action_id)
}, context)
return openerp.controllers.actions.execute(
Share.go_step_1([sharing_view_id], context),