[Erp5-report] r45092 fx.algrain - /erp5/trunk/bt5/erp5_credential/SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: fx.algrain
Date: Tue Apr  5 16:03:07 2011
New Revision: 45092

URL: http://svn.erp5.org?rev=45092&view=rev
Log:
Create the recovery if no question else show question dialog

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

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=45092&r1=45091&r2=45092&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] Tue Apr  5 16:03:07 2011
@@ -65,10 +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
-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
-     reference=reference))\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=question_free_text,\n
+     default_credential_question_question_title=question_title,\n
+     reference=reference))\
 </string> </value>
         </item>
         <item>