diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index 91ee6bd1f33..bd935498bc8 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -59,7 +59,7 @@ class mail_alias(osv.Model): def _get_alias_domain(self, cr, uid, ids, name, args, context=None): ir_config_parameter = self.pool.get("ir.config_parameter") - domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context) + domain = ir_config_parameter.get_param(cr, SUPERUSER_ID, "mail.catchall.domain", context=context) return dict.fromkeys(ids, domain or "") _columns = { diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index 0dd438d13af..d76e32a5fe8 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -36,6 +36,8 @@ openerp_announcement = function(instance) { }); $('head').append($css); + }).fail(function(result, ev){ + ev.preventDefault(); }); } }); diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 9d69b908f4d..04f903ff9aa 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1155,6 +1155,9 @@ instance.web.UserMenu = instance.web.Widget.extend({ scope: 'userinfo', }; instance.web.redirect('https://accounts.openerp.com/oauth2/auth?'+$.param(params)); + }).fail(function(result, ev){ + ev.preventDefault(); + instance.web.redirect('https://accounts.openerp.com/web'); }); } }, diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index 3fa980f4368..04416f23758 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -111,7 +111,7 @@ "access_multi_company_default user","multi_company_default all","model_multi_company_default",,1,0,0,0 "access_multi_company_default manager","multi_company_default Manager","model_multi_company_default","group_erp_manager",1,1,1,1 "access_ir_filter all","ir_filters all","model_ir_filters",,1,1,1,1 -"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0 +"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter","group_user",1,0,0,0 "access_ir_config_parameter_system","ir_config_parameter_system","model_ir_config_parameter","group_system",1,1,1,1 "access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0