[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 c658a3e..e682c8d 100644 (file)
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -1,37 +1,49 @@
 import urlparse
-
 import cherrypy
 
+from openobject import rpc
 from openobject.tools import expose, ast
+
 import openerp.controllers
-from openerp.controllers import actions
-from openerp.utils import rpc, TinyDict
 
-class Piratepad(openerp.controllers.SecuredController):
+
+
+class ShareWizardController(openerp.controllers.SecuredController):
     _cp_path = "/share"
-    
+
     @expose()
-    def index(self, **kw):
-        domain = ast.literal_eval(kw['domain'])
-        search_domain = ast.literal_eval(kw['search_domain'])
-        filter_domain = ast.literal_eval(kw['filter_domain'])
-        
-        context = ast.literal_eval(kw['context'])
-        view_name = context.get('_terp_view_name')
-        
-        domain.extend(search_domain)
-        
-        action_id = rpc.RPCProxy('ir.actions.actions').search([('name','=',view_name)], 0, 0, 0, context)
-        if action_id:
+    def index(self, domain, context, view_id, search_domain='[]', action_id=None):
+        context = ast.literal_eval(context)
+
+        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]
-        
-        model =  'share.wizard'
-        proxy = rpc.RPCProxy(model)
-        
-        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], '_terp_view_name': 'Share Wizard'})
-        data = {'domain': str(domain), 'action_id':action_id}
-        id = proxy.create(data, context)
-        res = rpc.session.execute('object', 'execute', model, 'go_step_1', [id], context)
-        return actions.execute(res, ids=[id])
-    
+
+        domain = ast.literal_eval(domain)
+        domain.extend(ast.literal_eval(search_domain))
+
+        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', ''))
+
+        context.update(
+            #active_ids=share_wiz_id,
+            #active_id=share_wiz_id[0],
+            _terp_view_name='Share Wizard',
+            share_root_url=share_root_url)
+        Share = rpc.RPCProxy('share.wizard')
+        sharing_view_id = Share.create({
+            'domain': str(domain),
+            'action_id': action_id and int(action_id)
+        }, context)
+        return openerp.controllers.actions.execute(
+            Share.go_step_1([sharing_view_id], context),
+            ids=[sharing_view_id], context=context)