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

[MERGE]: Merge with latest trunk-addons 

bzr revid: rpa@tinyerp.com-20120808124042-kgvbzqci10sbe6xm
This commit is contained in:
Rucha (Open ERP) 2012-08-08 18:10:42 +05:30
parent 39d0bda73d 6c12d5b308
commit 0d0603a397
5 changed files with 6 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):

1
addons/portal/security/ir.model.access.csv
View File

@ -9,3 +9,4 @@ access_mail_thread,mail.thread,mail.model_mail_thread,group_portal_member,1,0,0,
access_mail_subscription,mail.subscription,mail.model_mail_subscription,group_portal_member,1,0,1,1
access_mail_notification,mail.notification,mail.model_mail_notification,group_portal_member,1,0,1,0
access_mail_group,mail.group,mail.model_mail_group,group_portal_member,1,0,0,0
access_mail_alias,mail.alias,mail.model_mail_alias,group_portal_member,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
9 access_mail_subscription mail.subscription mail.model_mail_subscription group_portal_member 1 0 1 1
10 access_mail_notification mail.notification mail.model_mail_notification group_portal_member 1 0 1 0
11 access_mail_group mail.group mail.model_mail_group group_portal_member 1 0 0 0
12 access_mail_alias mail.alias mail.model_mail_alias group_portal_member 1 0 0 0

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)