From e0da07cb8a0768ce3b2283e47a5820eac6ce7a09 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Mon, 27 Jun 2011 22:27:48 -0300 Subject: [PATCH] remove blank spaces --- .../CredentialRecovery_sendPasswordResetLink.xml | 4 ++-- .../CredentialRequest_checkLoginAvailability.xml | 1 - .../CredentialRequest_createPersonAndAssignment.xml | 2 +- .../erp5_credential/CredentialRequest_createUser.xml | 2 +- ...etPropertyFromAuthenticatedMemberSubordinationValue.xml | 3 ++- ...otificationMessage_getSubstitutionFromPasswordReset.xml | 7 ++++--- bt5/erp5_credential/bt/revision | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.xml index 9ea5a51039..276671314b 100644 --- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.xml +++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.xml @@ -62,9 +62,9 @@ notification_message = portal.NotificationTool_getDocumentValue("crendential_rec \n context.REQUEST.set(\'came_from\', context.getUrlString())\n \n -portal.portal_password.mailPasswordResetRequest(user_login=reference, \n +portal.portal_password.mailPasswordResetRequest(user_login=reference,\n REQUEST=context.REQUEST,\n - notification_message = notification_message)\n + notification_message=notification_message)\n </string> </value> </item> <item> diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml index 667f008ea7..ff6a0cd09b 100644 --- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml +++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml @@ -79,7 +79,6 @@ if context.getPortalType() == "Credential Request":\n if related_person.getReference() == value:\n return True\n \n -\n #check no pending credential request with this user name\n #Don\'t take in case the current credential \n module = context.getDefaultModule("Credential Request")\n 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 3c869ed52f..d40474e1a7 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 @@ -84,7 +84,7 @@ login, password = context.CredentialRequest_createUser()\n context.CredentialRequest_updateLocalRolesOnSecurityGroups()\n \n # Send notification in activities\n -context.activate(activity=\'SQLQueue\').CredentialRequest_sendAcceptedNotification(login,password)\n +context.activate(activity=\'SQLQueue\').CredentialRequest_sendAcceptedNotification(login, password)\n </string> </value> </item> <item> 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 48b41f53f3..90c543024c 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 @@ -60,7 +60,7 @@ if REQUEST:\n person = context.getDestinationDecisionValue(portal_type="Person")\n \n # Create user of the person only if not exist\n -if person.hasReference() and person.getPassword(): \n +if person.hasReference() and person.getPassword():\n return person.getReference(), None\n \n # Set login\n diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getPropertyFromAuthenticatedMemberSubordinationValue.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getPropertyFromAuthenticatedMemberSubordinationValue.xml index 2ac2104952..3179592c55 100644 --- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getPropertyFromAuthenticatedMemberSubordinationValue.xml +++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getPropertyFromAuthenticatedMemberSubordinationValue.xml @@ -52,7 +52,8 @@ <key> <string>_body</string> </key> <value> <string>"""Get property on the Organisation of current user\n Parameter:\n -property_name -- property to get, Mandatory (String, Example: "title")"""\n + property_name -- property to get, Mandatory (String, Example: \'title\')\n +"""\n person = context.ERP5Site_getAuthenticatedMemberPersonValue()\n if person is not None:\n organisation = person.getDefaultCareerSubordinationValue()\n diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/NotificationMessage_getSubstitutionFromPasswordReset.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/NotificationMessage_getSubstitutionFromPasswordReset.xml index c403c06d25..4aa74b2e86 100644 --- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/NotificationMessage_getSubstitutionFromPasswordReset.xml +++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/NotificationMessage_getSubstitutionFromPasswordReset.xml @@ -53,9 +53,10 @@ <value> <string>"""Use information given in the method mailPasswordResetRequest of Password Tool\n to build a substitution mapping dict. \n Parameters: \n -instance_name -- Current erp5 portal title\n -reset_password_link -- Url to reset the password\n -expiration_date -- Expiration Datetime of the link"""\n + instance_name -- Current erp5 portal title\n + reset_password_link -- Url to reset the password\n + expiration_date -- Expiration Datetime of the link\n +"""\n return {\'reset_password_link\':reset_password_link,\n \'expiration_date\': context.Base_FormatDate(date=expiration_date,\n hour_minute = True,\n diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision index bbce65161c..2a9c18ad50 100644 --- a/bt5/erp5_credential/bt/revision +++ b/bt5/erp5_credential/bt/revision @@ -1 +1 @@ -356 \ No newline at end of file +357 \ No newline at end of file -- 2.30.9