extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-18 19:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix app.js was not properly updated

Browse Source 
Fixes changes to recurring events did not always show
This commit is contained in:
nathan
2022-11-23 09:04:05 -07:00
parent 7f936cdaf1
commit 0efe1e865f
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
calendar/js/app.js
View File

@@ -658,9 +658,13 @@ var CalendarApp = /** @class */ (function (_super) {
} }
// Check if we're interested by date? // Check if we're interested by date?
if (cal_event.end <= new Date(this.state.first).valueOf() / 1000 || cal_event.start > new Date(this.state.last).valueOf() / 1000) { if (cal_event.end <= new Date(this.state.first).valueOf() / 1000 || cal_event.start > new Date(this.state.last).valueOf() / 1000) {
// The event is outside our current view // The event is outside our current view, but check if it's just one of a recurring event
if (!cal_event.range_end && !cal_event.range_start ||
cal_event.range_end <= new Date(this.state.first).valueOf() / 1000 ||
cal_event.range_start > new Date(this.state.last).valueOf() / 1000) {
return; return;
} }
}
// Do we already have "fresh" data? Most user actions give fresh data in response // Do we already have "fresh" data? Most user actions give fresh data in response
var existing = egw.dataGetUIDdata('calendar::' + pushData.id); var existing = egw.dataGetUIDdata('calendar::' + pushData.id);
if (existing && Math.abs(existing.timestamp - new Date().valueOf()) < 1000) { if (existing && Math.abs(existing.timestamp - new Date().valueOf()) < 1000) {
@@ -2170,22 +2174,6 @@ var CalendarApp = /** @class */ (function (_super) {
var event = data.data; var event = data.data;
this.egw.json('calendar.calendar_uiforms.ajax_custom_mail', [event, false, _action.id === 'sendrequest'], null, null, null, null).sendRequest(); this.egw.json('calendar.calendar_uiforms.ajax_custom_mail', [event, false, _action.id === 'sendrequest'], null, null, null, null).sendRequest();
}; };
/**
* Insert selected event(s) into a document
*
* Actually, just pass it off to the nextmatch
*
* @param {egwAction} _action
* @param {egwActionObject[]} _selected
*/
CalendarApp.prototype.action_merge = function (_action, _selected) {
var ids = { ids: [] };
for (var i = 0; i < _selected.length; i++) {
ids.ids.push(_selected[i].id);
}
nm_action(egw_getActionManager(this.appname, false, 1)
.getActionById('nm').getActionById(_action.id), _selected, null, ids);
};
/** /**
* Sidebox merge * Sidebox merge
* *