summaryrefslogtreecommitdiff
path: root/addons/calendar/controllers/main.py
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2015-11-27 13:14:47 +0100
committerqsm-odoo <qsm@odoo.com>2015-11-27 16:20:32 +0100
commitbba2e39fb8a4443eb80c570bf8b8984b64f6fe7c (patch)
tree9e2ffaa22f78ee8b00540e8b4c00d89c30f486ff /addons/calendar/controllers/main.py
parent2790bb4492cdca3b1aed4fb16989b165d6ad45d4 (diff)
[FIX] calendar: redirection after invitation email
When accepting/declining a calendar event invitation received by mail, we landed on an empty gray webclient. The confirmation page had been dropped with passage to new JS API / new calendar / new webclient. Previous mechanism had been reimplemented: custom web client with event information/confirmation if the user is not connected or redirection to the event form view if the user is connected. + FIX manyattendeetag : the status circle did not turn red when an user declined the invitation.
Diffstat (limited to 'addons/calendar/controllers/main.py')
-rw-r--r--addons/calendar/controllers/main.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/calendar/controllers/main.py b/addons/calendar/controllers/main.py
index 770c73bd41c..afe85209f03 100644
--- a/addons/calendar/controllers/main.py
+++ b/addons/calendar/controllers/main.py
@@ -48,7 +48,13 @@ class meeting_invitation(http.Controller):
if attendee:
attendee_data['current_attendee'] = attendee[0]
- values = dict(init="s.calendar.event('%s', '%s', '%s', '%s' , '%s');" % (db, action, id, 'form', json.dumps(attendee_data)))
+ values = dict(
+ init = """
+ odoo.define('calendar.invitation_page', function (require) {
+ require('base_calendar.base_calendar').showCalendarInvitation('%s', '%s', '%s', '%s', '%s');
+ });
+ """ % (db, action, id, 'form', json.dumps(attendee_data))
+ )
return request.render('web.webclient_bootstrap', values)
# Function used, in RPC to check every 5 minutes, if notification to do for an event or not