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

[FIX] web_calendar: correct timezone handling when creating new events 

bzr revid: odo@openerp.com-20140219163134-dzmx34yffnithn30
This commit is contained in:
jke@openerp.com 2014-02-19 17:31:34 +01:00 committed by Olivier Dony
parent c83247c38b
commit 50849309d1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/web/static/src/js/views.js
View File

@ -600,6 +600,7 @@ instance.web.ViewManager = instance.web.Widget.extend({
action_views_ids : views_ids action_views_ids : views_ids
}, self.flags, self.flags[view.view_type] || {}, view.options || {}) }, self.flags, self.flags[view.view_type] || {}, view.options || {})
}); });
views_ids[view.view_type] = view.view_id; views_ids[view.view_type] = view.view_id;
}); });
if (this.flags.views_switcher === false) { if (this.flags.views_switcher === false) {
@ -607,7 +608,11 @@ instance.web.ViewManager = instance.web.Widget.extend({
} }
// If no default view defined, switch to the first one in sequence // If no default view defined, switch to the first one in sequence
var default_view = this.flags.default_view || this.views_src[0].view_type; var default_view = this.flags.default_view || this.views_src[0].view_type;
return this.switch_mode(default_view);
return this.switch_mode(default_view, null, this.flags[default_view] && this.flags[default_view].options);
}, },
switch_mode: function(view_type, no_store, view_options) { switch_mode: function(view_type, no_store, view_options) {
var self = this; var self = this;

7
addons/web_calendar/static/src/js/web_calendar.js
View File

@ -652,8 +652,8 @@ openerp.web_calendar = function(instance) {
} }
if (this.all_day) { if (this.all_day) {
event_end = (new Date(event_end.getTime())).addDays(1); event_end = (new Date(event_end.getTime())).addDays(1);
date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()); date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),12);
date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()); date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),12);
} }
else { else {
date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7); date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);
@ -666,7 +666,6 @@ openerp.web_calendar = function(instance) {
} }
else { else {
data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]); data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]);
if (this.date_stop) { if (this.date_stop) {
data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]); data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]);
@ -1070,6 +1069,8 @@ openerp.web_calendar = function(instance) {
return infos; return infos;
}, },
slow_create: function(data) { slow_create: function(data) {
//if all day, we could reset time to display 00:00:00
var self = this; var self = this;
var def = $.Deferred(); var def = $.Deferred();
var defaults = {}; var defaults = {};