diff options
| author | Nicolas Galler <ngl@odoo.com> | 2020-11-19 09:19:20 +0000 |
|---|---|---|
| committer | Nicolas Galler <ngl@odoo.com> | 2020-11-20 09:50:08 +0000 |
| commit | a1073325ed7cb231dcce27c8b2d2df67821bbdf4 (patch) | |
| tree | dd9b8e1f917776869ba46ad50bd3cad97cd0efea /addons/calendar | |
| parent | 7c32f977aa5233d47ba6aebef56dc70f7b7b9bac (diff) | |
[FIX] calendar: invalid accept link in reminder email
Behavior prior to the commit:
- the accept link in the reminder email for a meeting has a parameter
`event_id`, instead of `id`, which causes an error 500 when the user
tries to accept the meeting
Behavior after the commit:
- the accept link uses the correct `id` parameter
opw-2366173
closes odoo/odoo#61983
Signed-off-by: Nicolas Galler <ngaller@users.noreply.github.com>
Diffstat (limited to 'addons/calendar')
| -rw-r--r-- | addons/calendar/data/mail_data.xml | 2 | ||||
| -rw-r--r-- | addons/calendar/i18n/calendar.pot | 2 | ||||
| -rw-r--r-- | addons/calendar/i18n/da.po | 4 | ||||
| -rw-r--r-- | addons/calendar/i18n/zh_CN.po | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/addons/calendar/data/mail_data.xml b/addons/calendar/data/mail_data.xml index d48bb4613e2..64b89533668 100644 --- a/addons/calendar/data/mail_data.xml +++ b/addons/calendar/data/mail_data.xml @@ -204,7 +204,7 @@ This is a reminder for the below event : </p> <div style="text-align: center; margin: 16px 0px 16px 0px;"> - <a href="/calendar/meeting/accept?token=${object.access_token}&event_id=${object.event_id.id}" + <a href="/calendar/meeting/accept?token=${object.access_token}&id=${object.event_id.id}" style="padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px"> Accept</a> <a href="/calendar/meeting/decline?token=${object.access_token}&id=${object.event_id.id}" diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot index 8ef3a9f76df..37e00a57164 100644 --- a/addons/calendar/i18n/calendar.pot +++ b/addons/calendar/i18n/calendar.pot @@ -226,7 +226,7 @@ msgid "" " This is a reminder for the below event :\n" " </p>\n" " <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n" -" <a href=\"/calendar/meeting/accept?token=${object.access_token}&event_id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" +" <a href=\"/calendar/meeting/accept?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Accept</a>\n" " <a href=\"/calendar/meeting/decline?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Decline</a>\n" diff --git a/addons/calendar/i18n/da.po b/addons/calendar/i18n/da.po index 55ea2e946ef..8fe694302fb 100644 --- a/addons/calendar/i18n/da.po +++ b/addons/calendar/i18n/da.po @@ -392,7 +392,7 @@ msgid "" " This is a reminder for the below event :\n" " </p>\n" " <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n" -" <a href=\"/calendar/meeting/accept?token=${object.access_token}&event_id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" +" <a href=\"/calendar/meeting/accept?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Accept</a>\n" " <a href=\"/calendar/meeting/decline?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Decline</a>\n" @@ -466,7 +466,7 @@ msgstr "" " Dette er en påmindelse om nedenstående begivenhed :\n" " </p>\n" " <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n" -" <a href=\"/calendar/meeting/accept?token=${object.access_token}&event_id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" +" <a href=\"/calendar/meeting/accept?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Acceptér</a>\n" " <a href=\"/calendar/meeting/decline?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Afvis</a>\n" diff --git a/addons/calendar/i18n/zh_CN.po b/addons/calendar/i18n/zh_CN.po index 9cf64dbec97..8a69e5d98dc 100644 --- a/addons/calendar/i18n/zh_CN.po +++ b/addons/calendar/i18n/zh_CN.po @@ -396,7 +396,7 @@ msgid "" " This is a reminder for the below event :\n" " </p>\n" " <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n" -" <a href=\"/calendar/meeting/accept?token=${object.access_token}&event_id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" +" <a href=\"/calendar/meeting/accept?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Accept</a>\n" " <a href=\"/calendar/meeting/decline?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " Decline</a>\n" @@ -470,7 +470,7 @@ msgstr "" " 这是以下事件的提醒 :\n" " </p>\n" " <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n" -" <a href=\"/calendar/meeting/accept?token=${object.access_token}&event_id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" +" <a href=\"/calendar/meeting/accept?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " 接受</a>\n" " <a href=\"/calendar/meeting/decline?token=${object.access_token}&id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n" " 拒绝</a>\n" |
