extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get calendar working with rollup

Browse Source 
owner widget was not being loaded
This commit is contained in:
nathangray 2021-07-05 09:24:37 -06:00 committed by Ralf Becker
parent 08e9798a6d
commit 18cf49f0f2
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/app.ts
View File

@ -24,6 +24,7 @@ import {EgwApp, PushData} from "../../api/js/jsapi/egw_app";
import {etemplate2} from "../../api/js/etemplate/etemplate2";
import {et2_container} from "../../api/js/etemplate/et2_core_baseWidget";
import {et2_date} from "../../api/js/etemplate/et2_widget_date";
import {et2_calendar_owner} from "./et2_widget_owner";
import {day, day4, listview, month, planner, week, weekN} from "./View";
import {et2_calendar_view} from "./et2_widget_view";
import {et2_calendar_timegrid} from "./et2_widget_timegrid";
@ -43,17 +44,8 @@ import {date} from "../../api/js/etemplate/lib/date.js";
import {sprintf} from "../../api/js/egw_action/egw_action_common.js";
import {egw_registerGlobalShortcut} from "../../api/js/egw_action/egw_keymanager.js";
// et2 widgets need to be imported, so they register themselves
import "./et2_widget_daycol";
import "./et2_widget_event";
import "./et2_widget_owner";
import "./et2_widget_planner";
import "./et2_widget_planner_row";
import "./et2_widget_timegrid";
import "./et2_widget_view";
import {egw, egw_getFramework, framework} from "../../api/js/jsapi/egw_global";
import {et2_number} from "../../api/js/etemplate/et2_widget_number";
import {et2_calendar_owner} from "./et2_widget_owner";
import {et2_template} from "../../api/js/etemplate/et2_widget_template";
import {et2_checkbox} from "../../api/js/etemplate/et2_widget_checkbox";
import {et2_grid} from "../../api/js/etemplate/et2_widget_grid";
@ -264,6 +256,9 @@ export class CalendarApp extends EgwApp
var sidebox = jQuery('#favorite_sidebox_'+this.appname);
if(sidebox.length == 0 && egw_getFramework() != null)
{
// Force rollup to load owner widget, it leaves it out otherwise
new et2_calendar_owner(_et2.widgetContainer,{});
var egw_fw = egw_getFramework();
sidebox= jQuery('#favorite_sidebox_'+this.appname,egw_fw.sidemenuDiv);
}

5
calendar/js/et2_widget_owner.ts
View File

@ -8,11 +8,6 @@
* @author Nathan Gray
*/
/*egw:uses
et2_widget_taglist;
*/
import {et2_register_widget} from "../../api/js/etemplate/et2_core_widget";
import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox";
import {et2_taglist_email} from "../../api/js/etemplate/et2_widget_taglist";