changeset 3e3a8e97da9b in sao:5.4
details: https://hg.tryton.org/sao?cmd=changeset;node=3e3a8e97da9b
description:
Consider event as all day only for date instances
issue8922
review282561002
(grafted from 552b3d0940f6ebfd4989ab61402e817f4450e750)
diffstat:
src/view/calendar.js | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (24 lines):
diff -r 827445cebe59 -r 3e3a8e97da9b src/view/calendar.js
--- a/src/view/calendar.js Sat Dec 28 17:50:36 2019 +0100
+++ b/src/view/calendar.js Sat Dec 28 17:52:30 2019 +0100
@@ -116,7 +116,6 @@
if (this.attributes.dtend) {
date_end = record.field_get_client(this.attributes.dtend);
}
- var allDay = true;
var description = [];
for (var i = 1; i < this.fields.length; i++) {
description.push(
@@ -125,9 +124,9 @@
}
description = description.join('\n');
if (date_start) {
- if (date_end && date_end.isDateTime) {
- allDay = false;
- } else if (date_end && !date_end.isSame(date_start) &&
+ var allDay = date_start.isDate &&
+ (!date_end || date_end.isDate);
+ if (date_end && !date_end.isSame(date_start) &&
this.screen.current_view.view_type == "calendar") {
// Add one day to allday event that last more than one day.
// http://github.com/fullcalendar/fullcalendar/issues/2909