summaryrefslogtreecommitdiff
path: root/addons/web_calendar/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-03-23 16:43:37 +0100
committerChristophe Simonis <chs@odoo.com>2017-03-24 15:12:39 +0100
commit5847de4aaf94eb5d69a4cf9aba9ceb74a7b9ab43 (patch)
tree70dcc883fa73056ebfe38d9d4b6ba65112208541 /addons/web_calendar/static/src
parentb2d66d0c1468b9d321d9ffa5782e370e92525a43 (diff)
[FIX] web_calendar: remove attendee icons from event title
Diffstat (limited to 'addons/web_calendar/static/src')
-rw-r--r--addons/web_calendar/static/src/js/web_calendar.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index d90987413f2..55b22403bca 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -276,7 +276,7 @@ openerp.web_calendar = function(instance) {
self.proxy('update_record')(event._id, data);
},
eventRender: function (event, element, view) {
- element.find('.fc-event-title').html(event.title);
+ element.find('.fc-event-title').html(event.title + event.attendee_avatars);
},
eventAfterRender: function (event, element, view) {
if ((view.name !== 'month') && (((event.end-event.start)/60000)<=30)) {
@@ -567,7 +567,6 @@ openerp.web_calendar = function(instance) {
if (attendee_other.length>2) {
the_title_avatar += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';
}
- the_title = the_title_avatar + the_title;
}
}
@@ -578,6 +577,7 @@ openerp.web_calendar = function(instance) {
'start': date_start.toString('yyyy-MM-dd HH:mm:ss'),
'end': date_stop.toString('yyyy-MM-dd HH:mm:ss'),
'title': the_title,
+ 'attendee_avatars': the_title_avatar,
'allDay': (this.fields[this.date_start].type == 'date' || (this.all_day && evt[this.all_day]) || false),
'id': evt.id,
'attendees':attendees