odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] share: correct login url + add action to embed url 

bzr revid: chs@openerp.com-20111220150714-dltvf2p1dedjo97h
This commit is contained in:
Christophe Simonis 2011-12-20 16:07:14 +01:00
parent 9b5949e2c5
commit 5c92c476d3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/share/wizard/share_wizard.py
View File

@ -95,10 +95,13 @@ class share_wizard(osv.osv_memory):
# NOTE: take _ids in parameter to allow usage through browse_record objects
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
if base_url:
base_url += '/?db=%(dbname)s&login=%(login)s'
base_url += '/web/webclient/login?db=%(dbname)s&login=%(login)s'
extra = context and context.get('share_url_template_extra_arguments')
if extra:
base_url += '&' + '&'.join('%s=%%(%s)s' % (x,x) for x in extra)
hash_ = context and context.get('share_url_template_hash_arguments')
if hash_:
base_url += '#' + '&'.join('%s=%%(%s)s' % (x,x) for x in hash_)
return base_url
def _share_root_url(self, cr, uid, ids, _fieldname, _args, context=None):
@ -156,9 +159,10 @@ class share_wizard(osv.osv_memory):
result = dict.fromkeys(ids, '')
for this in self.browse(cr, uid, ids, context=context):
if this.result_line_ids:
ctx = dict(context, share_url_template_extra_arguments=['key'])
ctx = dict(context, share_url_template_extra_arguments=['key'],
share_url_template_hash_arguments=['action_id'])
user = this.result_line_ids[0]
data = dict(dbname=cr.dbname, login=user.login, key=user.password)
data = dict(dbname=cr.dbname, login=user.login, key=user.password, action_id=this.action_id.id)
result[this.id] = this.share_url_template(context=ctx) % data
return result