pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_calendar: Selection fields used as color attributes of calendar view

Browse Source
This commit is contained in:
rma-odoo
2015-03-16 13:25:00 +01:00
committed by Jérome Maes
parent 71c624163c
commit f5a506743e
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_calendar/static/src/js/web_calendar.js
+9 -10
View File
@@ -707,20 +707,19 @@ openerp.web_calendar = function(instance) {
console.log("Consecutive ``do_search`` called. Cancelling.");
return;
}
if (!self.useContacts) { // If we use all peoples displayed in the current month as filter in sidebars
var filter_item;
self.now_filter_ids = [];
var color_field = self.fields[self.color_field];
_.each(events, function (e) {
var key,val = null;
if (self.color_field.type == "selection") {
var key, val = null;
if (self.fields[self.color_field].type == "selection"){
key = e[self.color_field];
val = _.find( self.color_field.selection, function(name){ return name[0] === key;});
}
else {
val = _.find( self.fields[self.color_field].selection, function(name){ return name[0] === key;});
}else{
key = e[self.color_field][0];
val = e[self.color_field];
}
@@ -742,16 +741,16 @@ openerp.web_calendar = function(instance) {
if (self.sidebar) {
self.sidebar.filter.events_loaded();
self.sidebar.filter.set_filters();
events = $.map(events, function (e) {
var key = self.color_field.type == "selection" ? e[self.color_field] : e[self.color_field][0];
var key = self.fields[self.color_field].type == "selection"?e[self.color_field]:e[self.color_field][0];
if (_.contains(self.now_filter_ids, key) && self.all_filters[key].is_checked) {
return e;
}
return null;
});
}
}
else { //WE USE CONTACT
if (self.attendee_people !== undefined) {