entrouvert
/
glasnost
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

des modifs de vandoeuvre

This commit is contained in:
fpeters 2004-01-30 16:07:55 +00:00
parent e48d63b7ae
commit c66e41a86b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shared/web/IdentitiesWeb.py
View File

@ -85,7 +85,7 @@ from glasnost.proxy.tools import getProxyForServerRole
import ObjectsWeb as objects
import things
from tools import OK, HTTP_NO_CONTENT, accessForbidden, \
from tools import OK, HTTP_NO_CONTENT, accessForbidden, failure, \
getWeb, getWebForServerRole, redirect, writePageLayout
@ -611,9 +611,16 @@ class IdentitiesWeb(objects.ObjectsWebMixin, proxyIdentities.IdentitiesProxy):
user = context.getVar('user')
serviceProviderHostName = authenticationRequest.getProviderID()
providersWeb = getWebForServerRole('providers')
serviceProviderId = providersWeb.getServiceProviderId(
try:
serviceProviderId = providersWeb.getServiceProviderId(
serviceProviderHostName)
serviceProvider = providersWeb.getObject(serviceProviderId)
serviceProvider = providersWeb.getObject(serviceProviderId)
except faults.MissingItem:
session = context.getVar('session')
session['isDirty'] = 1
del session['authenticationRequestKeywords']
return failure(_('Unknown service provider'))
serviceIdentification = None
if user.serviceIdentifications is not None:
for service in user.serviceIdentifications:

7
shared/web/X509AccountsWeb.py
View File

@ -90,7 +90,7 @@ class X509AccountsWeb(objects.ObjectsWebMixin,
layout += form
buttonsBar = X.div(_class = 'buttons-bar')
form += buttonsBar
buttonsBar += X.buttonInForm('retry', 'retryButton')
buttonsBar += X.buttonInForm(_('Retry'), 'retryButton')
return writePageLayout(layout, _(stringError))
finally:
context.pull(_level = 'returnToRetryPage')
@ -115,8 +115,8 @@ class X509AccountsWeb(objects.ObjectsWebMixin,
userToken, authenticationMethod \
= self.checkObjectAuthentication(serial)
except faults.WrongX509Serial:
return self.returnToRetryPage(_(
'Unknown certificate serial number = %s' % serial))
return self.returnToRetryPage(
_('Unknown certificate serial number = %s') % serial)
except:
if context.getVar('debug'):
raise
@ -124,3 +124,4 @@ class X509AccountsWeb(objects.ObjectsWebMixin,
identitiesWeb = getWebForServerRole('identities')
return identitiesWeb.loginSucceeded(userToken, authenticationMethod)
login.isPublicForWeb = 1