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

settings_loaders: compute final idp_registration_url after other variables (#36281)

This commit is contained in:
Benjamin Dauvergne 2019-10-03 20:24:39 +02:00
parent 3320657f0c
commit 2cc9c1f05a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hobo/multitenant/settings_loaders.py
View File

@ -145,10 +145,7 @@ class TemplateVars(FileBaseSettingsLoader):
variables['idp_url'] = service.get('base_url')
variables['idp_api_url'] = service.get('base_url') + 'api/'
variables['idp_account_url'] = service.get('base_url') + 'accounts/'
idp_registration_url = service.get('base_url') + 'accounts/register/'
if 'portal_user_url' in variables:
idp_registration_url += '?%s' % urlencode({'next': variables['portal_user_url']})
variables['idp_registration_url'] = idp_registration_url
variables['idp_registration_url'] = service.get('base_url') + 'accounts/register/'
if not service.get('this'):
continue
@ -159,6 +156,9 @@ class TemplateVars(FileBaseSettingsLoader):
if 'portal-agent' in service.get('template_name', ''):
variables['is_portal_agent'] = True
if 'portal_user_url' in variables and 'idp_registration_url' in variables:
variables['idp_registration_url'] += '?%s' % urlencode({'next': variables['portal_user_url']})
if getattr(settings, 'HOBO_MANAGER_HOMEPAGE_TITLE_VAR', None):
variables['manager_homepage_title'] = \
variables.get(settings.HOBO_MANAGER_HOMEPAGE_TITLE_VAR)