holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: make sure non-infolog integrations get processed correctly

Browse Source
This commit is contained in:
nathangray 2021-03-24 09:59:43 -06:00
parent aa32aaccd8
commit d372f79f82
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -552,9 +552,13 @@ var CalendarApp = /** @class */ (function (_super) {
app: this.appname app: this.appname
}); });
if (integrated_pushData.type == "delete" || egw.dataHasUID(this.uid(integrated_pushData))) { if (integrated_pushData.type == "delete" || egw.dataHasUID(this.uid(integrated_pushData))) {
return _super.prototype.push.call(this, integrated_pushData); // Super always looks at this.et2, make sure it finds listview
var old_et2 = this.et2;
this.et2 = CalendarApp.views.listview.etemplates[0].widgetContainer;
_super.prototype.push.call(this, integrated_pushData);
this.et2 = old_et2;
} }
// Ask for the real data, we don't have it // Ask for the real data, we don't have it. This also updates views that don't use nextmatch.
this._fetch_data(this.state, undefined, 0, [integrated_pushData.id]); this._fetch_data(this.state, undefined, 0, [integrated_pushData.id]);
} }
} }

8
calendar/js/app.ts
View File

@ -489,9 +489,13 @@ class CalendarApp extends EgwApp
}); });
if(integrated_pushData.type == "delete" || egw.dataHasUID(this.uid(integrated_pushData))) if(integrated_pushData.type == "delete" || egw.dataHasUID(this.uid(integrated_pushData)))
{ {
return super.push(integrated_pushData); // Super always looks at this.et2, make sure it finds listview
let old_et2 = this.et2;
this.et2 = (<etemplate2> CalendarApp.views.listview.etemplates[0]).widgetContainer;
super.push(integrated_pushData);
this.et2 = old_et2;
} }
// Ask for the real data, we don't have it // Ask for the real data, we don't have it. This also updates views that don't use nextmatch.
this._fetch_data(this.state,undefined,0,[integrated_pushData.id]); this._fetch_data(this.state,undefined,0,[integrated_pushData.id]);
} }
} }