From 6a339b0b1100d2fe5e23ed3980df5de6500910a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Algrain?= <fxalgrain@tiolive.com>
Date: Tue, 5 Apr 2011 14:03:07 +0000
Subject: [PATCH] Create the recovery if no question else show question dialog
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45092 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...ERP5Site_getRelatedCredentialQuestionDialog.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
index 6acdd4f636..9a6cf45926 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
@@ -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>
--
2.30.9