diff --git a/hobo/multitenant/settings_loaders.py b/hobo/multitenant/settings_loaders.py index 463d0a5..51a41f0 100644 --- a/hobo/multitenant/settings_loaders.py +++ b/hobo/multitenant/settings_loaders.py @@ -5,6 +5,7 @@ from importlib import import_module from django.conf import settings from django.utils.encoding import smart_bytes +from django.utils.http import urlencode from django.utils.six.moves.urllib import parse as urlparse from hobo.theme.utils import get_theme @@ -144,7 +145,10 @@ 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/' - variables['idp_registration_url'] = service.get('base_url') + 'accounts/register/' + 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 if not service.get('this'): continue