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

Get calendar quick-add working with Ralf's changes to open an etemplate in a dialog (c63784d7e8), fix buttons from those etemplates weren't adopted

Browse Source
This commit is contained in:
nathan
2023-07-11 17:07:51 -06:00
committed by ralf
parent 5c02a0d98e
commit b35e26a7f3
4 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/Et2Dialog/Et2Dialog.ts
View File

@@ -930,7 +930,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
_adoptTemplateButtons()
{
// Check for something with buttons slot set
let search_in = <HTMLElement>(this._template_widget?.DOMContainer || this._contentNode);
let search_in = <HTMLElement>(this._template_widget?.DOMContainer ?? this._contentNode);
if(!search_in)
{
return;
@@ -1004,7 +1004,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
get _contentNode() : HTMLElement
{
return this.querySelector('.dialog_content');
return this.querySelector('.dialog_content') ?? this.querySelector("*");
}
_setupMoveResize()

9
api/js/etemplate/etemplate2.ts
View File

@@ -1617,7 +1617,14 @@ export class etemplate2
uniqueId = data.DOMNodeID.replace('.', '-') + '-' + data['open_target'];
}
const et2 = new etemplate2(node, data.data.menuaction, uniqueId);
return et2.load(data.name, data.url, data.data, null, null, null, data['fw-target']);
return et2.load(data.name, data.url, data.data, null, null, null, data['fw-target'])
.then(() =>
{
if(dialog)
{
dialog._adoptTemplateButtons();
}
});
}
else
{