diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-30 11:44:31 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-30 11:44:31 +0200 |
| commit | fbd52d57d83f064bd3bbc45a655217e909f1847a (patch) | |
| tree | 6ce8129596dc9d7e6d7a48db81cb07f4ac1b566e /addons | |
| parent | ee09d117389fb74ee7d69b5af11daf85036ee4b5 (diff) | |
| parent | b8f866c57b7bcf45fe3fd8c8b9bde30a24d67bc9 (diff) | |
[MERGE] forward port branch saas-14 up to b8f866c57b7
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/auth_signup/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/event/data/email_template_data.xml | 1 | ||||
| -rw-r--r-- | addons/event/models/event.py | 11 |
3 files changed, 14 insertions, 2 deletions
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 0b2b3aab9a8..ae4a5a91311 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -40,7 +40,9 @@ class AuthSignupHome(Home): _logger.error(e.message) qcontext['error'] = _("Could not create a new account.") - return request.render('auth_signup.signup', qcontext) + response = request.render('auth_signup.signup', qcontext) + response.headers['X-Frame-Options'] = 'DENY' + return response @http.route('/web/reset_password', type='http', auth='public', website=True) def web_auth_reset_password(self, *args, **kw): diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index 27dfb81ce1d..2e61e2bc781 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -328,7 +328,6 @@ <td style="padding:25px 0px;"> <strong>Add this event to your calendar</strong> <a href="https://www.google.com/calendar/render?action=TEMPLATE&text=${object.event_id.name}&dates=${date_begin}/${date_end}&location=${location}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16"> Google</a> - <a href="https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&summary=${object.event_id.name}&dtstart=${date_begin}&dtend=${date_end}&location=${location}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16"> Outlook</a> <a href="https://calendar.yahoo.com/?v=60&view=d&type=20&title=${object.event_id.name}&in_loc=${location}&st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&et=${format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%S')}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16"> Yahoo</a> </td> </tr> diff --git a/addons/event/models/event.py b/addons/event/models/event.py index 15ae5e53c10..e415ce17818 100644 --- a/addons/event/models/event.py +++ b/addons/event/models/event.py @@ -457,6 +457,17 @@ class EventRegistration(models.Model): return recipients @api.multi + def message_get_default_recipients(self): + # Prioritize registration email over partner_id, which may be shared when a single + # partner booked multiple seats + return { + r.id: {'partner_ids': [], + 'email_to': r.email, + 'email_cc': False} + for r in self + } + + @api.multi def action_send_badge_email(self): """ Open a window to compose an email, with the template - 'event_badge' message loaded by default |