odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Chris Biersbach 2013-04-03 15:23:46 +02:00
parent f3ce4dedf3
commit cd52a05d1d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web_calendar/static/src/js/calendar.js
View File

@ -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;