summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/calendar
diff options
context:
space:
mode:
authorJorge Pinna Puissant <jpp@odoo.com>2019-11-12 14:26:05 +0000
committerfw-bot <otis@odoo.com>2019-11-14 15:09:12 +0000
commita5702a1ff1e60add4401c9cf0b3636a8f3e4c04c (patch)
tree94062dd557ac1eaab3029df4d3344dc67084a098 /addons/web/static/src/js/views/calendar
parent03e44375feaabb70c3d8118721d50b957f4c443e (diff)
[FIX] web: moving non-all day events
In a view month of calendar, when moving a non-all day event from a date A to a date B. Before this commit, the event will be changed to an all day event type. Now, the event will be staid unchanged, only the date will be updated. opw-2093111 X-original-commit: df001af5341bf35f36fe455d69bbb46f4b0fa00c Co-authored-by: Nicolas Lempereur <nle@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/views/calendar')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_model.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js
index 18a13d0157e..82832bc043c 100644
--- a/addons/web/static/src/js/views/calendar/calendar_model.js
+++ b/addons/web/static/src/js/views/calendar/calendar_model.js
@@ -65,10 +65,11 @@ return AbstractModel.extend({
}
var isDateEvent = this.fields[this.mapping.date_start].type === 'date';
+ var keepRecordTime = !this.mapping.all_day || (this.data.scale === 'month' && event.record && !event.record[this.mapping.all_day]);
// An "allDay" event without the "all_day" option is not considered
// as a 24h day. It's just a part of the day (by default: 7h-19h).
if (event.allDay) {
- if (!this.mapping.all_day && !isDateEvent) {
+ if (keepRecordTime && !isDateEvent) {
if (event.r_start) {
start.hours(event.r_start.hours())
.minutes(event.r_start.minutes())
@@ -94,7 +95,7 @@ return AbstractModel.extend({
if (this.mapping.all_day) {
if (event.record) {
data[this.mapping.all_day] =
- (this.scale !== 'month' && event.allDay) ||
+ (this.data.scale !== 'month' && event.allDay) ||
event.record[this.mapping.all_day] &&
end.diff(start) < 10 ||
false;