From 3ca0bd3e84d71e55c341dcddc787f08040dc320e Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 26 Feb 2018 11:31:11 -0700 Subject: [PATCH] * Calendar - Fix moving event to an un-loaded day would show only that event when the day is viewed --- calendar/js/et2_widget_event.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js index 1a7ef69e37..0e94802598 100644 --- a/calendar/js/et2_widget_event.js +++ b/calendar/js/et2_widget_event.js @@ -193,6 +193,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten _UID_callback: function _UID_callback(event) { // Copy to avoid changes, which may cause nm problems var value = event === null ? null : jQuery.extend({},event); + var parent = this._parent; // Make sure id is a string, check values if(value) @@ -204,8 +205,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten if(!this._sameday_check(value)) { // May need to update parent to remove out-of-view events - var parent = this._parent; - this._parent.removeChild(this); + parent.removeChild(this); if(event === null && parent && parent._out_of_view) { parent._out_of_view(); @@ -826,7 +826,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten { new_daywise.push(event.row_id); } - if(new_daywise.data !== null) + if(egw.dataHasUID(new_cache_id)) { egw.dataStoreUID(new_cache_id,new_daywise); }