added setting for adeline portal url

This commit is contained in:
Frédéric Péters 2008-12-12 16:11:55 +01:00
parent 53ffca5549
commit 106bd9b76f
2 changed files with 12 additions and 3 deletions

View File

@ -266,6 +266,8 @@ class AdelineSettingsDirectory(Directory):
value = adeline_cfg.get('msp_session_image_url'))
form.add(StringWidget, 'msp_new_account_url', title = _('MSP New Account URL'),
value = adeline_cfg.get('msp_new_account_url'))
form.add(StringWidget, 'adeline_portal_url', title = _('Portal URL (Admin24/24)'),
value = adeline_cfg.get('adeline_portal_url'))
form.add(StringWidget, 'http_auth_tuple', title = _('HTTP Authentication Tuple'),
value = adeline_cfg.get('http_auth_tuple'),
hint = _('Format: username:password'))
@ -281,7 +283,8 @@ class AdelineSettingsDirectory(Directory):
else:
cfg_submit(form, 'adeline', ['msp_idp', 'msp_portal_url',
'data_migration_url', 'http_auth_tuple',
'msp_session_image_url', 'msp_new_account_url'])
'msp_session_image_url', 'msp_new_account_url',
'adeline_portal_url'])
redirect('.')
def mspmapping [html] (self):

View File

@ -1,5 +1,6 @@
import lasso
import Cookie
import urlparse
from quixote import redirect, get_session, get_session_manager, get_response, get_field, get_request
from qommon import get_cfg, get_logger
@ -253,7 +254,7 @@ class AlternateRootDirectory(OldRootDirectory):
resp = get_response()
resp.set_header('X-Gdd-Account-Number', coll.id)
if not return_to_url:
return_to_url = '/liberty/sp/http-mes-demarches.valid.monservicepubliclocal.fr-Admin2424-valid-liberty-metadata/login'
return_to_url = get_cfg('adeline', {}).get('adeline_portal_url', '/')
break
session = get_session()
@ -280,7 +281,7 @@ class AlternateRootDirectory(OldRootDirectory):
resp = get_response()
resp.set_header('X-Gdd-Account-Number', coll.id)
if not return_to_url:
return_to_url = '/liberty/sp/http-mes-demarches.valid.monservicepubliclocal.fr-Admin2424-valid-liberty-metadata/login'
return_to_url = get_cfg('adeline', {}).get('adeline_portal_url', '/')
break
session = get_session()
@ -376,6 +377,11 @@ class AlternateRootDirectory(OldRootDirectory):
authentication_failure = _('Authentication Failure')
get_logger().info('login page (after failed attempt)')
else:
redirect_url = get_response().get_header('location')
if redirect_url and urlparse.urlsplit(redirect_url)[2] in ('/', ''):
return_to_url = get_cfg('adeline', {}).get('adeline_portal_url', '/')
if return_to_url:
return redirect(return_to_url)
return t
site_name = get_cfg('misc', {}).get('sitename', _('Login'))