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

Calendar: Fix different template load order could result in missing categories and extra loading

Browse Source
This commit is contained in:
nathan 2023-05-15 10:14:22 -06:00
parent 60643d86b2
commit 3398c97055
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/js/et2_widget_planner.ts
View File

@ -722,10 +722,22 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
row_labels: function() row_labels: function()
{ {
var im = this.getInstanceManager(); var im = this.getInstanceManager();
this.nodeName = "ET2-SELECT-CAT_RO"
var categories = <SelectOption[]>StaticOptions.cached_server_side(this, "cat", ',,,calendar', false);
var labels = []; var labels = [];
var categories = <SelectOption[]>StaticOptions.cached_server_side(this, "cat", ',,,calendar', false);
if(!categories || categories.length == 0)
{
// No categories at all? Probably loading before sidebox is done. Ask directly and wait for them, rather than firing
// 50 different requests.
egw.json(
'EGroupware\\Api\\Etemplate\\Widget\\Select::ajax_get_options',
['select-cat', ',,,calendar'],
function(data)
{
categories = data;
}
).sendRequest(false);
}
let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar; let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar;
if(!app_calendar.state.cat_id || if(!app_calendar.state.cat_id ||
app_calendar.state.cat_id.toString() === '' || app_calendar.state.cat_id.toString() === '' ||