entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 18 Releases Activity

settings loaders: include global title in email from (#22262)

This commit is contained in:
Frédéric Péters 2018-03-05 12:29:11 +01:00
parent b7b7a84879
commit 3b36c4fcd3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hobo/multitenant/settings_loaders.py
View File

@ -143,7 +143,11 @@ class TemplateVars(FileBaseSettingsLoader):
tenant_settings.TEMPLATE_VARS.update(variables)
if variables.get('default_from_email'):
tenant_settings.DEFAULT_FROM_EMAIL = variables['default_from_email']
if variables.get('global_title'):
tenant_settings.DEFAULT_FROM_EMAIL = '%s <%s>' % (
variables['global_title'], variables['default_from_email'])
else:
tenant_settings.DEFAULT_FROM_EMAIL = variables['default_from_email']
class CORSSettings(FileBaseSettingsLoader):