Ajouts messages de retour du formulaire de demande de réinitialisation de mot de...

diff --git a/RegistrationTool.py b/RegistrationTool.py
index f34b4a5f3d09c55cd47763774cb41f5357271986..f31a5c62ab16bfe695b727736f4d0484f312a51a 100644 (file)
--- a/RegistrationTool.py
+++ b/RegistrationTool.py
@@ -225,6 +225,9 @@ class RegistrationTool(BaseRegistrationTool) :
                                                  charset = 'UTF-8',
                                                  body=body)
             mailhost.send(message)
                                                  charset = 'UTF-8',
                                                  body=body)
             mailhost.send(message)

+            return
+        
+        return _('Unknown user name. Please retry.')

     
     security.declarePrivate('clearExpiredPasswordResetRequests')
     def clearExpiredPasswordResetRequests(self):
     
     security.declarePrivate('clearExpiredPasswordResetRequests')
     def clearExpiredPasswordResetRequests(self):

diff --git a/skins/generic/request_password_reset_form.py b/skins/generic/request_password_reset_form.py
index 69a34c3f4fa03daa619135d6b17739794d4b6bfc..1e9b57c2519aa06091b15c7dda15bc173324211f 100644 (file)
--- a/skins/generic/request_password_reset_form.py
+++ b/skins/generic/request_password_reset_form.py
@@ -1,13 +1,17 @@
-##parameters=userid='', requestReset=''
+##parameters=userid='', requestReset='', ajax=''

 from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.Plinn.utils import Message as _
 utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')
 rtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IRegistrationTool')
 
 if requestReset :
 from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.Plinn.utils import Message as _
 utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')
 rtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IRegistrationTool')
 
 if requestReset :

-    uuid = rtool.requestPasswordReset(userid)
-    context.setStatus(True, _('request for resetting password sent'))
-    return 'yeah !'
+    msg = rtool.requestPasswordReset(userid)
+    if not  msg :
+        context.setStatus(True, _('Request for resetting password sent to your contact email.'))
+        context.setRedirect(utool.getPortalObject(), 'object/view', ajax=ajax)
+        return
+    
+    context.setStatus(False, msg)

 
 options={}
 target = '%s/request_password_reset_form' % utool()
 
 options={}
 target = '%s/request_password_reset_form' % utool()