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

[MERGE] mail: avoid resetting purposefully empty catchall domain setting, courtesy of Stefan Rijnhart (Therp) 

bzr revid: odo@openerp.com-20140505075129-hv4evrdw5v7crtmw
This commit is contained in:
Olivier Dony 2014-05-05 09:51:29 +02:00
parent 188930bb01 d77b000aff
commit 2f7ac6838d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/mail/res_config.py
View File

@ -33,14 +33,14 @@ class project_configuration(osv.TransientModel):
}
def get_default_alias_domain(self, cr, uid, ids, context=None):
alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
if not alias_domain:
alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", default=None, context=context)
if alias_domain is None:
domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
try:
alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
except Exception:
pass
return {'alias_domain': alias_domain}
return {'alias_domain': alias_domain or False}
def set_alias_domain(self, cr, uid, ids, context=None):
config_parameters = self.pool.get("ir.config_parameter")