Projet

Général

Profil

0001-settings_loaders-compute-final-idp_registration_url-.patch

Benjamin Dauvergne, 04 octobre 2019 02:15

Télécharger (1,9 ko)

Voir les différences: 

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(-)
hobo/multitenant/settings_loaders.py
145 145 
                variables['idp_url'] = service.get('base_url')
146 146 
                variables['idp_api_url'] = service.get('base_url') + 'api/'
147 147 
                variables['idp_account_url'] = service.get('base_url') + 'accounts/'
148 
                idp_registration_url = service.get('base_url') + 'accounts/register/'
149 
                if 'portal_user_url' in variables:
150 
                    idp_registration_url += '?%s' % urlencode({'next': variables['portal_user_url']})
151 
                variables['idp_registration_url'] = idp_registration_url
148 
                variables['idp_registration_url'] = service.get('base_url') + 'accounts/register/'
152 149 

  		




  153
  150
  
    
            if not service.get('this'):

  		




  154
  151
  
    
                continue

  		




  ......




  159
  156
  
    
            if 'portal-agent' in service.get('template_name', ''):

  		




  160
  157
  
    
                variables['is_portal_agent'] = True

  		




  161
  158
  
    

  		




  
  159
  
    
        if 'portal_user_url' in variables and 'idp_registration_url' in variables:

  		




  
  160
  
    
            variables['idp_registration_url'] += '?%s' % urlencode({'next': variables['portal_user_url']})

  		




  
  161
  
    

  		




  162
  162
  
    
        if getattr(settings, 'HOBO_MANAGER_HOMEPAGE_TITLE_VAR', None):

  		




  163
  163
  
    
            variables['manager_homepage_title'] = \

  		




  164
  164
  
    
                        variables.get(settings.HOBO_MANAGER_HOMEPAGE_TITLE_VAR)

  		




  165
  
  
    
-