summaryrefslogtreecommitdiff
path: root/addons/google_calendar/static/src
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2015-09-17 13:56:55 +0200
committerOlivier Dony <odo@openerp.com>2015-09-17 13:57:04 +0200
commit43a12e99bdfa0247ebb7ed61091ef24b47748155 (patch)
treed6db082090c224f4b9d6a2bc57687454ceca5284 /addons/google_calendar/static/src
parent10bd5f797a6dc1e8379daaae038962151e59dad2 (diff)
[FIX] calendar: filter events by attendees when sidebar is used with `useContacts`
Add some missing deferred chains + change domain for loading calendar.events.
Diffstat (limited to 'addons/google_calendar/static/src')
-rw-r--r--addons/google_calendar/static/src/js/calendar_sync.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/calendar_sync.js
index b827f25b633..b76f94d8af0 100644
--- a/addons/google_calendar/static/src/js/calendar_sync.js
+++ b/addons/google_calendar/static/src/js/calendar_sync.js
@@ -67,10 +67,14 @@ openerp.google_calendar = function(instance) {
instance.web_calendar.CalendarView.include({
extraSideBar: function() {
- this._super();
+ var self = this;
+ result = this._super();
if (this.dataset.model == "calendar.event") {
- this.$el.find('.oe_calendar_filter').prepend(QWeb.render('GoogleCalendar.buttonSynchro'));
+ return result.then(function() {
+ self.$el.find('.oe_calendar_filter').prepend(QWeb.render('GoogleCalendar.buttonSynchro'));
+ });
}
+ return result;
}
});