extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix cdbfcb391 broke planner view

Browse Source
This commit is contained in:
nathangray 2020-03-18 10:15:22 -06:00
parent d21cd6bcd9
commit a2d9e8cae0
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
calendar/js/et2_widget_event.js
View File

@ -167,15 +167,16 @@ var et2_calendar_event = /** @class */ (function (_super) {
* Callback for changes in cached data * Callback for changes in cached data
*/ */
et2_calendar_event.prototype._UID_callback = function (event) { et2_calendar_event.prototype._UID_callback = function (event) {
// Copy to avoid changes, which may cause nm problems // Copy to avoid changes, which may cause nm problems
var value = event === null ? null : jQuery.extend({}, event); var value = event === null ? null : jQuery.extend({}, event);
var parent = this.getParent(); var parent = this.getParent();
// Make sure id is a string, check values var parent_owner = parent.getDOMNode(parent).dataset['owner'] || parent.getParent().options.owner;
if (value) { // Make sure id is a string, check values
this._values_check(value); if (value) {
} this._values_check(value);
// Check for changing days in the grid view }
if (!this._sameday_check(value) || !this._status_check(value, app.calendar.getState().status_filter, parent.options.owner)) { // Check for changing days in the grid view
if (!this._sameday_check(value) || !this._status_check(value, app.calendar.getState().status_filter, parent_owner)) {
// May need to update parent to remove out-of-view events // May need to update parent to remove out-of-view events
parent.removeChild(this); parent.removeChild(this);
if (event === null && parent && parent.instanceOf(et2_widget_daycol_1.et2_calendar_daycol)) { if (event === null && parent && parent.instanceOf(et2_widget_daycol_1.et2_calendar_daycol)) {
@ -185,16 +186,16 @@ var et2_calendar_event = /** @class */ (function (_super) {
this.destroy(); this.destroy();
return; return;
} }
// Copy to avoid changes, which may cause nm problems // Copy to avoid changes, which may cause nm problems
this.options.value = jQuery.extend({}, value); this.options.value = jQuery.extend({}, value);
if (this.getParent().options.date) { if (this.getParent().options.date) {
this.options.value.date = this.getParent().options.date; this.options.value.date = this.getParent().options.date;
} }
// Let parent position - could also be et2_calendar_planner_row // Let parent position - could also be et2_calendar_planner_row
this.getParent().position_event(this); this.getParent().position_event(this);
// Parent may remove this if the date isn't the same // Parent may remove this if the date isn't the same
if (this.getParent()) { if (this.getParent()) {
this._update(); this._update();
} }
}; };
/** /**
@ -652,16 +653,16 @@ var et2_calendar_event = /** @class */ (function (_super) {
this._actionObject = null; this._actionObject = null;
} }
// Update daywise caches // Update daywise caches
var new_cache_id = CalendarApp._daywise_cache_id(event.date, this.getParent().options.owner); var new_cache_id = CalendarApp._daywise_cache_id(event.date, this.getParent().options.owner);
var new_daywise = egw.dataGetUIDdata(new_cache_id); var new_daywise = egw.dataGetUIDdata(new_cache_id);
new_daywise = new_daywise && new_daywise.data ? new_daywise.data : []; new_daywise = new_daywise && new_daywise.data ? new_daywise.data : [];
var old_cache_id = ''; var old_cache_id = '';
if (this.options.value && this.options.value.date) { if (this.options.value && this.options.value.date) {
old_cache_id = CalendarApp._daywise_cache_id(this.options.value.date, parent.options.owner); old_cache_id = CalendarApp._daywise_cache_id(this.options.value.date, parent.options.owner);
} }
if (new_cache_id != old_cache_id) { if (new_cache_id != old_cache_id) {
var old_daywise = egw.dataGetUIDdata(old_cache_id); var old_daywise = egw.dataGetUIDdata(old_cache_id);
old_daywise = old_daywise && old_daywise.data ? old_daywise.data : []; old_daywise = old_daywise && old_daywise.data ? old_daywise.data : [];
old_daywise.splice(old_daywise.indexOf(this.options.value.row_id), 1); old_daywise.splice(old_daywise.indexOf(this.options.value.row_id), 1);
egw.dataStoreUID(old_cache_id, old_daywise); egw.dataStoreUID(old_cache_id, old_daywise);
if (new_daywise.indexOf(event.row_id) < 0) { if (new_daywise.indexOf(event.row_id) < 0) {
@ -763,16 +764,16 @@ var et2_calendar_event = /** @class */ (function (_super) {
} }
return result; return result;
}; };
/** /**
* Click handler calling custom handler set via onclick attribute to this.onclick. * Click handler calling custom handler set via onclick attribute to this.onclick.
* All other handling is done by the timegrid widget. * All other handling is done by the timegrid widget.
* *
* @param {Event} _ev * @param {Event} _ev
* @returns {boolean} * @returns {boolean}
*/ */
et2_calendar_event.prototype.click = function (_ev) { et2_calendar_event.prototype.click = function (_ev) {
var result = true; var result = true;
if (typeof this.onclick == 'function') { if (typeof this.onclick == 'function') {
// Make sure function gets a reference to the widget, splice it in as 2. argument if not // Make sure function gets a reference to the widget, splice it in as 2. argument if not
var args = Array.prototype.slice.call(arguments); var args = Array.prototype.slice.call(arguments);
if (args.indexOf(this) == -1) if (args.indexOf(this) == -1)

5
calendar/js/et2_widget_event.ts
View File

@ -209,7 +209,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
{ {
// Copy to avoid changes, which may cause nm problems // Copy to avoid changes, which may cause nm problems
const value = event === null ? null : jQuery.extend({}, event); const value = event === null ? null : jQuery.extend({}, event);
let parent = this.getParent(); let parent = <et2_DOMWidget>this.getParent();
let parent_owner = parent.getDOMNode(parent).dataset['owner'] || parent.getParent().options.owner;
// Make sure id is a string, check values // Make sure id is a string, check values
if(value) if(value)
@ -218,7 +219,7 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
} }
// Check for changing days in the grid view // Check for changing days in the grid view
if(!this._sameday_check(value) || !this._status_check(value, app.calendar.getState().status_filter, parent.options.owner)) if(!this._sameday_check(value) || !this._status_check(value, app.calendar.getState().status_filter, parent_owner))
{ {
// May need to update parent to remove out-of-view events // May need to update parent to remove out-of-view events
parent.removeChild(this); parent.removeChild(this);