[FIX] Calendar in web client does not display all fields
lp bug: https://launchpad.net/bugs/972356 fixed bzr revid: fme@openerp.com-20120417101517-7xg6oaf8a9lkasy1
This commit is contained in:
commit
601be9166f
|
@ -242,22 +242,14 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
|
||||||
var date_start = openerp.web.str_to_datetime(evt[this.date_start]),
|
var date_start = openerp.web.str_to_datetime(evt[this.date_start]),
|
||||||
date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null,
|
date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null,
|
||||||
date_delay = evt[this.date_delay] || 1.0,
|
date_delay = evt[this.date_delay] || 1.0,
|
||||||
res_text = '',
|
res_text = '';
|
||||||
res_description = [];
|
|
||||||
|
|
||||||
if (this.info_fields) {
|
if (this.info_fields) {
|
||||||
var fld = evt[this.info_fields[0]];
|
res_text = _.map(this.info_fields, function(fld) {
|
||||||
res_text = (typeof fld == 'object') ? fld[fld.length -1] : res_text = fld;
|
if(evt[fld] instanceof Array)
|
||||||
|
return evt[fld][1];
|
||||||
var sliced_info_fields = this.info_fields.slice(1);
|
return evt[fld];
|
||||||
for (var sl_fld in sliced_info_fields) {
|
});
|
||||||
var slc_fld = evt[sliced_info_fields[sl_fld]];
|
|
||||||
if (typeof slc_fld == 'object') {
|
|
||||||
res_description.push(slc_fld[slc_fld.length - 1]);
|
|
||||||
} else if (slc_fld) {
|
|
||||||
res_description.push(slc_fld);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!date_stop && date_delay) {
|
if (!date_stop && date_delay) {
|
||||||
date_stop = date_start.clone().addHours(date_delay);
|
date_stop = date_start.clone().addHours(date_delay);
|
||||||
|
@ -265,9 +257,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
|
||||||
var r = {
|
var r = {
|
||||||
'start_date': date_start.toString('yyyy-MM-dd HH:mm:ss'),
|
'start_date': date_start.toString('yyyy-MM-dd HH:mm:ss'),
|
||||||
'end_date': date_stop.toString('yyyy-MM-dd HH:mm:ss'),
|
'end_date': date_stop.toString('yyyy-MM-dd HH:mm:ss'),
|
||||||
'text': res_text,
|
'text': res_text.join(', '),
|
||||||
'id': evt.id,
|
'id': evt.id
|
||||||
'title': res_description.join()
|
|
||||||
};
|
};
|
||||||
if (evt.color) {
|
if (evt.color) {
|
||||||
r.color = evt.color;
|
r.color = evt.color;
|
||||||
|
|
Loading…
Reference in New Issue