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

Calendar: Better refresh when toggling integrated apps

Browse Source
This commit is contained in:
nathangray 2021-03-09 10:06:51 -07:00
parent f2cb47105e
commit 2df67647d8
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/js/app.js
View File

@ -803,19 +803,31 @@ var CalendarApp = /** @class */ (function (_super) {
} }
// Make sure it's an array, not an object // Make sure it's an array, not an object
integration_preference = jQuery.extend([], integration_preference); integration_preference = jQuery.extend([], integration_preference);
var callback = function () { };
if (action.checked) { if (action.checked) {
integration_preference.push(app); integration_preference.push(app);
// After the preference change is done, get new info which should now include the app
callback = function () {
this._fetch_data(this.state);
}.bind(this);
} }
else { else {
var index = integration_preference.indexOf(app); var index = integration_preference.indexOf(app);
if (index > -1) { if (index > -1) {
integration_preference.splice(index, 1); integration_preference.splice(index, 1);
} }
// Clear any events from that app
var events = egw.dataKnownUIDs('calendar');
for (var i = 0; i < events.length; i++) {
var event_data = egw.dataGetUIDdata("calendar::" + events[i]).data || { app: "calendar" };
if (event_data && event_data.app === app) {
// Remove entry, then delete it from the cache
egw.dataStoreUID("calendar::" + events[i], null);
egw.dataDeleteUID('calendar::' + events[i]);
}
}
} }
egw.set_preference("calendar", "integration_toggle", integration_preference); egw.set_preference("calendar", "integration_toggle", integration_preference, callback);
// Force redraw to current state with new info, but wait a bit to let preference change get there first
this._clear_cache();
window.setTimeout(function () { this.setState({ state: this.state }); }.bind(this), 500);
}; };
/** /**
* Set the app header * Set the app header

26
calendar/js/app.ts
View File

@ -799,9 +799,16 @@ class CalendarApp extends EgwApp
// Make sure it's an array, not an object // Make sure it's an array, not an object
integration_preference = jQuery.extend([],integration_preference); integration_preference = jQuery.extend([],integration_preference);
let callback = function() {};
if(action.checked) if(action.checked)
{ {
integration_preference.push(app); integration_preference.push(app);
// After the preference change is done, get new info which should now include the app
callback = function() {
this._fetch_data(this.state);
}.bind(this);
} }
else else
{ {
@ -809,12 +816,21 @@ class CalendarApp extends EgwApp
if (index > -1) { if (index > -1) {
integration_preference.splice(index, 1); integration_preference.splice(index, 1);
} }
}
egw.set_preference("calendar","integration_toggle",integration_preference);
// Force redraw to current state with new info, but wait a bit to let preference change get there first // Clear any events from that app
this._clear_cache(); let events = egw.dataKnownUIDs('calendar');
window.setTimeout(function() {this.setState({state: this.state})}.bind(this),500); for(let i = 0; i < events.length; i++)
{
let event_data = egw.dataGetUIDdata("calendar::" + events[i]).data || {app: "calendar"};
if(event_data && event_data.app === app)
{
// Remove entry, then delete it from the cache
egw.dataStoreUID("calendar::"+events[i], null);
egw.dataDeleteUID('calendar::' + events[i]);
}
}
}
egw.set_preference("calendar","integration_toggle",integration_preference, callback);
} }
/** /**