summaryrefslogtreecommitdiff
path: root/addons/share/web/controllers.py
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2010-11-22 13:53:34 +0100
committerXavier Morel <xmo@openerp.com>2010-11-22 13:53:34 +0100
commite581a46baeaca8d6f8d68df0dad51a630c8a99fb (patch)
treeec16613b038e65d82ef3a6a655bcd1a9e7861015 /addons/share/web/controllers.py
parent0ad1fbaefbc8e962597ba65f460becb05924424a (diff)
[FIX] share: send correct share_root_url to server action, add dbname to share_root_url so user can actually be logged in if server has multiple dbs
bzr revid: xmo@openerp.com-20101122125334-w0cpt1p4s471q1wb
Diffstat (limited to 'addons/share/web/controllers.py')
-rw-r--r--addons/share/web/controllers.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index b97c86799e2..de44d0ecac3 100644
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -1,3 +1,5 @@
+import urlparse
+
from openobject.tools import expose, ast
from openerp.controllers import actions
from openerp.utils import rpc
@@ -26,7 +28,11 @@ class ShareWizardController(openerp.controllers.SecuredController):
action_id = action_id[0]
share_model = 'share.wizard'
- share_root_url = cherrypy.request.base
+
+ 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')])