From cd52a05d1d25dc1e9e6f232f47982d3506e2720c Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Wed, 3 Apr 2013 15:23:46 +0200 Subject: [PATCH] [FIX] Forwardport of 6.1 merge proposal by msh: Fixed the issue of Calendar responsible label not translated when there is selection field on responsible. bzr revid: cbi@openerp.com-20130403132346-bs0k6na71nmu7ztl --- addons/web_calendar/static/src/js/calendar.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 6297070af58..fdc2f947728 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -265,6 +265,12 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ //To parse Events we have to convert date Format var res_events = [], sidebar_items = {}; + var selection_label = {}; + if(this.fields[this.color_field].selection) { + _(this.fields[this.color_field].selection).each(function(value){ + selection_label[value[0]] = value[1]; + }); + } for (var e = 0; e < events.length; e++) { var evt = events[e]; if (!evt[this.date_start]) { @@ -274,6 +280,9 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ if (this.color_field) { var filter = evt[this.color_field]; if (filter) { + if(this.fields[this.color_field].selection) { + filter = selection_label[filter]; + } var filter_value = (typeof filter === 'object') ? filter[0] : filter; if (typeof(fn_filter) === 'function' && !fn_filter(filter_value)) { continue;