From 5a9f1cb0fdb2b086e39dbf444707ab2377615746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Tue, 5 Apr 2011 16:26:20 +0000 Subject: [PATCH] - revert 45092 as it generated wrong BT5 git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45101 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...ERP5Site_getRelatedCredentialQuestionDialog.xml | 14 ++++---------- bt5/erp5_credential/bt/revision | 2 +- 2 files changed, 5 insertions(+), 11 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 9a6cf45926..6acdd4f636 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,16 +65,10 @@ 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 -#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))\ +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 </string> </value> </item> <item> diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision index d3824c2972..f9c94c8318 100644 --- a/bt5/erp5_credential/bt/revision +++ b/bt5/erp5_credential/bt/revision @@ -1 +1 @@ -324 +325 \ No newline at end of file -- 2.30.9