Commit b16313d1 authored by Jérome Perrin's avatar Jérome Perrin

Merge !492 Normalize notification message references

We realized that the references of notification messages used in credential request management had a typo (`crendential` vs `credential`) and that the message used for a new credential request was not using the same `credential_request` prefix as others.

This MR changes the messages as follow:

| Wrong Reference | Correct Reference |
| --- | --- |
| erp5-subscription.notification | credential_request-subscription |
| crendential_request-confirmation-without-password | credential_request-confirmation-without-password |
| crendential_request-confirmation-with-password | credential_request-confirmation-with-password |
| crendential_request-confirmation-without-password | credential_request-confirmation-without-password |
| crendential_recovery-reset-link | credential_recover-reset-link |
| crendential_recovery-username | credential_recovery-username |

This is an incompatible change that can affect projects that have defined some custom notification messages without explicitly setting the references on the system preferences (ie. getting the default value from the property definition).
I found one project using custom notification messages, but preference was defined.
Other projects I checked did not override these notification messages.

In our projects, we mostly use messages for credential requests, but the reference for the notification message is usually defined as a property of the web section.

So I'm confident this should not affect projects and we can proceed with this clean up without causing too much troubles. To check if you need to adjust notification messages, check if you have customized notification message with reference *Wrong Reference*.

/reviewed-on nexedi/erp5!492
parents 371c0b96 d4bf94f8
......@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>crendential_request-confirmation-with-password</string> </value>
<value> <string>credential_request-confirmation-with-password</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
......@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>crendential_request-confirmation-without-password</string> </value>
<value> <string>credential_request-confirmation-without-password</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
......@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>crendential_request-confirmation-without-password</string> </value>
<value> <string>credential_request-confirmation-without-password</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
......@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>crendential_recovery-reset-link</string> </value>
<value> <string>credential_recovery-reset-link</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
......@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>crendential_recovery-username</string> </value>
<value> <string>credential_recovery-username</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -76,7 +76,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>crendential_recovery-username.en</string> </value>
<value> <string>credential_recovery-username.en</string> </value>
</item>
<item>
<key> <string>language</string> </key>
......
......@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>erp5-subscription.notification</string> </value>
<value> <string>credential_request-subscription</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -76,7 +76,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_subscription_notification</string> </value>
<value> <string>credential_request-subscription</string> </value>
</item>
<item>
<key> <string>language</string> </key>
......
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'crendential_recovery-reset-link\'</string> </value>
<value> <string>python: \'credential_recovery-reset-link\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
......
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'crendential_recovery-username\'</string> </value>
<value> <string>python: \'credential_recovery-username\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
......
......@@ -12,7 +12,7 @@ if password:
notification_type = "with-password"
#Get message from catalog
notification_reference = 'crendential_request-confirmation-%s' % notification_type
notification_reference = 'credential_request-confirmation-%s' % notification_type
notification_message = portal.portal_notifications.getDocumentValue(reference=notification_reference,
language=recipient.getLanguage())
if notification_message is None:
......
......@@ -68,7 +68,7 @@ else:
after_path_and_method_id=path_and_method_id)
credential_request.activate(**activity_kw).CredentialRequest_sendSubmittedNotification(
context_url=context.absolute_url(),
notification_reference='erp5-subscription.notification')
notification_reference='credential_request-subscription')
message_str = "Thanks for your registration. You will be receive an email to activate your account."
else:
# no email verification is needed
......
......@@ -2,5 +2,5 @@ notification_message_module/20100928-1F79
notification_message_module/20100928-212A
notification_message_module/20100928-7459
notification_message_module/20110426-1B7D
notification_message_module/crendential_recovery-username.en
notification_message_module/erp5_subscription_notification
\ No newline at end of file
notification_message_module/credential_recovery-username.en
notification_message_module/credential_request-subscription
\ No newline at end of file
......@@ -2,8 +2,8 @@ notification_message_module/20100928-1F79
notification_message_module/20100928-212A
notification_message_module/20100928-7459
notification_message_module/20110426-1B7D
notification_message_module/crendential_recovery-username.en
notification_message_module/erp5_subscription_notification
notification_message_module/credential_recovery-username.en
notification_message_module/credential_request-subscription
portal_alarms/accept_submitted_credentials
portal_categories/question
portal_categories/question/credential
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment