[Erp5-report] r45284 fx.algrain - in /erp5/trunk/bt5/erp5_credential: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: fx.algrain
Date: Mon Apr 11 11:15:11 2011
New Revision: 45284

URL: http://svn.erp5.org?rev=45284&view=rev
Log:
When user ask to reset his password, if the associated person hasn't a recovery password question we should send the mail and not ask a response (to an empty question)

Modified:
    erp5/trunk/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
    erp5/trunk/bt5/erp5_credential/bt/revision

Modified: erp5/trunk/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml?rev=45284&r1=45283&r2=45284&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml [utf8] Mon Apr 11 11:15:11 2011
@@ -65,9 +65,16 @@ if len(result) != 1:\n
   return context.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
 \n
 person = result[0]\n
+\n
+#If any question, we can create directly the credential recovery\n
+question_free_text = person.getDefaultCredentialQuestionQuestionFreeText()\n
+question_title = person.getDefaultCredentialQuestionQuestionTitle()\n
+if not (question_free_text or question_title):\n
+  return context.ERP5Site_newCredentialRecovery(reference=reference)\n
+\n
 return context.Base_redirect(\'ERP5Site_newCredentialRecoveryDialog\', keep_items = \\\n
-dict(default_credential_question_question_free_text=person.getDefaultCredentialQuestionQuestionFreeText(),\n
-     default_credential_question_question_title=person.getDefaultCredentialQuestionQuestionTitle(),\n
+dict(default_credential_question_question_free_text=question_free_text,\n
+     default_credential_question_question_title=question_title,\n
      reference=reference))\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_credential/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_credential/bt/revision?rev=45284&r1=45283&r2=45284&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_credential/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_credential/bt/revision [utf8] Mon Apr 11 11:15:11 2011
@@ -1 +1 @@
-325
\ No newline at end of file
+326
\ No newline at end of file