[FIX] share+portal: fix share wizard.

[odoo/odoo.git] / addons / share / web / controllers.py

diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index b64d86c..e682c8d 100644 (file)
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -1,11 +1,10 @@
 import urlparse
+import cherrypy
 
+from openobject import rpc
 from openobject.tools import expose, ast
-from openerp.controllers import actions
-from openerp.utils import rpc
 
 import openerp.controllers
-import cherrypy
 
 
 
@@ -13,36 +12,38 @@ class ShareWizardController(openerp.controllers.SecuredController):
     _cp_path = "/share"
 
     @expose()
-    def index(self, domain, search_domain, context, view_id):
+    def index(self, domain, context, view_id, search_domain='[]', action_id=None):
         context = ast.literal_eval(context)
 
-        action_id = rpc.RPCProxy('ir.actions.act_window').search(
-            [('view_id','=',int(view_id))], context=context)
-        if not action_id: return ""
+        if not action_id:
+            # This should not be needed anymore, but just in case users are
+            # running the module with an older version of the web client...
+
+            # to remove soon-ish
+            action_id = rpc.RPCProxy('ir.actions.act_window').search(
+                [('view_id','=',int(view_id))], context=context)
+            if not action_id: return ""
+
+            action_id = action_id[0]
 
         domain = ast.literal_eval(domain)
         domain.extend(ast.literal_eval(search_domain))
 
-        action_id = action_id[0]
-        share_model =  'share.wizard'
-
         scheme, netloc, _, _, _ = urlparse.urlsplit(cherrypy.request.base)
         share_root_url = urlparse.urlunsplit((
             scheme, netloc, '/openerp/login',
             'db=%(dbname)s&user=%(login)s&password=%(password)s', ''))
 
-        share_wiz_id = rpc.RPCProxy('ir.ui.menu').search(
-            [('name','=', 'Share Wizard')])
         context.update(
-            active_ids=share_wiz_id,
-            active_id=share_wiz_id[0],
+            #active_ids=share_wiz_id,
+            #active_id=share_wiz_id[0],
             _terp_view_name='Share Wizard',
             share_root_url=share_root_url)
-        sharing_view_id = rpc.RPCProxy(share_model).create({
+        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 actions.execute(
-            rpc.session.execute('object', 'execute', share_model, 'go_step_1',
-                                [sharing_view_id], context),
+        return openerp.controllers.actions.execute(
+            Share.go_step_1([sharing_view_id], context),
             ids=[sharing_view_id], context=context)