From 2cc9c1f05a005eb89f6189d022b6c50ca3d94a95 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 3 Oct 2019 20:24:39 +0200 Subject: [PATCH] settings_loaders: compute final idp_registration_url after other variables (#36281) --- hobo/multitenant/settings_loaders.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hobo/multitenant/settings_loaders.py b/hobo/multitenant/settings_loaders.py index 51a41f0..941aa0d 100644 --- a/hobo/multitenant/settings_loaders.py +++ b/hobo/multitenant/settings_loaders.py @@ -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) -- 2.23.0