From 1ea46dd148b8a142b7ebeb7539f7e9cf656014e3 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Thu, 28 Jul 2011 11:03:35 +0300
Subject: [PATCH] Send properly email notofication.
---
.../CredentialRequest_createPersonAndAssignment.xml | 5 ++++-
.../erp5_credential/CredentialRequest_createUser.xml | 12 ++++--------
bt5/erp5_credential/bt/revision | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
index b8cb84b312..c75c44d08d 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
@@ -88,7 +88,10 @@ login, password = context.CredentialRequest_createUser()\n
# Update Local Roles\n
context.CredentialRequest_updateLocalRolesOnSecurityGroups()\n
\n
-if portal_preferences.isPreferredSystemGeneratePassword():\n
+if password is not None:\n
+ if password.startswith(\'{SSHA}\'):\n
+ #password is encoded, set it to None to script witch send the password to user\n
+ password = None\n
# Send notification in activities only if we already generated and set password\n
# else a Credential Recovery process will take care\n
context.activate(activity=\'SQLQueue\').CredentialRequest_sendAcceptedNotification(login, password)\n
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml
index 4a26cb821e..750c8e321f 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml
@@ -90,10 +90,10 @@ if not person.getPassword():\n
password = None\n
module = portal.getDefaultModule(portal_type=\'Credential Recovery\')\n
credential_recovery = module.newContent(\n
- portal_type="Credential Recovery",\n
- reference=login,\n
- destination_decision=person.getRelativeUrl(),\n
- language=portal.Localizer.get_selected_language())\n
+ portal_type="Credential Recovery",\n
+ reference=login,\n
+ destination_decision=person.getRelativeUrl(),\n
+ language=portal.Localizer.get_selected_language())\n
credential_recovery.submit()\n
else:\n
# system should generate a password\n
@@ -111,10 +111,6 @@ else:\n
#Check assignment for the current instance\n
person.Person_validateGlobalUserAccount()\n
\n
-if password is not None and password.startswith(\'{SSHA}\'):\n
- #password is encoded, set it to None to script witch send the password to user\n
- password = None\n
-\n
return login, password\n
</string> </value>
</item>
diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision
index 96baa13486..6d540e9f23 100644
--- a/bt5/erp5_credential/bt/revision
+++ b/bt5/erp5_credential/bt/revision
@@ -1 +1 @@
-381
\ No newline at end of file
+382
\ No newline at end of file
--
2.30.9