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

[FIX] correct home and login urls 

bzr revid: chs@openerp.com-20120808120214-13k9qgzx8gu330cs
This commit is contained in:
Christophe Simonis 2012-08-08 14:02:14 +02:00
parent 9db8f8ac64
commit 6c12d5b308
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/edi/controllers/main.py
View File

@ -19,10 +19,9 @@ class EDI(openerpweb.Controller):
_cp_path = "/edi"
def template(self, req, mods='web,edi'):
self.wc = openerpweb.controllers_path['/web/webclient']
d = {}
d["js"] = "\n".join('<script type="text/javascript" src="%s"></script>'%i for i in self.wc.manifest_list(req, mods, 'js'))
d["css"] = "\n".join('<link rel="stylesheet" href="%s">'%i for i in self.wc.manifest_list(req, mods, 'css'))
d["js"] = "\n".join('<script type="text/javascript" src="%s"></script>'%i for i in webmain.manifest_list(req, mods, 'js'))
d["css"] = "\n".join('<link rel="stylesheet" href="%s">'%i for i in webmain.manifest_list(req, mods, 'css'))
d["modules"] = simplejson.dumps(mods.split(','))
return d

2
addons/edi/static/src/js/edi.js
View File

@ -154,7 +154,7 @@ openerp.edi.EdiImport = openerp.web.OldWidget.extend({
on_imported: function(response) {
if ('action' in response) {
this.rpc("/web/session/save_session_action", {the_action: response.action}, function(key) {
window.location = "/web/webclient/home#sa="+encodeURIComponent(key);
window.location = "/#sa="+encodeURIComponent(key);
});
}
else {

2
addons/plugin/plugin_handler.py
View File

@ -19,7 +19,7 @@ class plugin_handler(osv.osv_memory):
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
if base_url:
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
base_url += '/web/webclient/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model)
base_url += '/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model)
return base_url
def is_installed(self, cr, uid):

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

@ -86,7 +86,7 @@ class share_wizard(osv.TransientModel):
# 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 += '/web/webclient/login?db=%(dbname)s&login=%(login)s&key=%(password)s'
base_url += '/login?db=%(dbname)s&login=%(login)s&key=%(password)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)