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

Etemplate: Prevent dialogs from destroying parent's request

Browse Source
This commit is contained in:
nathangray 2020-07-08 11:01:05 -06:00
parent dfb26264d0
commit 9cb143d0d3
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/js/etemplate/et2_widget_dialog.js
View File

@ -31,6 +31,7 @@ var et2_core_widget_1 = require("./et2_core_widget");
var et2_core_widget_2 = require("./et2_core_widget"); var et2_core_widget_2 = require("./et2_core_widget");
var et2_widget_button_1 = require("./et2_widget_button"); var et2_widget_button_1 = require("./et2_widget_button");
var et2_core_inheritance_1 = require("./et2_core_inheritance"); var et2_core_inheritance_1 = require("./et2_core_inheritance");
var etemplate2_1 = require("./etemplate2");
/** /**
* A common dialog widget that makes it easy to imform users or prompt for information. * A common dialog widget that makes it easy to imform users or prompt for information.
* *
@ -319,7 +320,7 @@ var et2_dialog = /** @class */ (function (_super) {
if (this.template && this.options.template != template) { if (this.template && this.options.template != template) {
this.template.clear(); this.template.clear();
} }
this.template = new etemplate2(this.div[0], false); this.template = new etemplate2_1.etemplate2(this.div[0], false);
if (template.indexOf('.xet') > 0) { if (template.indexOf('.xet') > 0) {
// File name provided, fetch from server // File name provided, fetch from server
this.template.load("", template, this.options.value || { content: {} }, jQuery.proxy(function () { this.template.load("", template, this.options.value || { content: {} }, jQuery.proxy(function () {
@ -333,6 +334,17 @@ var et2_dialog = /** @class */ (function (_super) {
// true: do NOT call et2_ready, as it would overwrite this.et2 in app.js // true: do NOT call et2_ready, as it would overwrite this.et2 in app.js
undefined, undefined, true); undefined, undefined, true);
} }
// Don't let dialog closing destroy the parent session
if (this.template.etemplate_exec_id && this.template.app) {
for (var _i = 0, _a = etemplate2_1.etemplate2.getByApplication(this.template.app); _i < _a.length; _i++) {
var et = _a[_i];
if (et !== this.template && et.etemplate_exec_id === this.template.etemplate_exec_id) {
// Found another template using that exec_id, don't destroy when dialog closes.
this.template.unbind_unload();
break;
}
}
}
// set template-name as id, to allow to style dialogs // set template-name as id, to allow to style dialogs
this.div.children().attr('id', template.replace(/^(.*\/)?([^/]+)(\.xet)?$/, '$2').replace(/\./g, '-')); this.div.children().attr('id', template.replace(/^(.*\/)?([^/]+)(\.xet)?$/, '$2').replace(/\./g, '-'));
}; };

15
api/js/etemplate/et2_widget_dialog.ts
View File

@ -19,6 +19,7 @@ import {et2_widget} from "./et2_core_widget";
import {et2_button} from "./et2_widget_button"; import {et2_button} from "./et2_widget_button";
import {ClassWithAttributes} from "./et2_core_inheritance"; import {ClassWithAttributes} from "./et2_core_inheritance";
import {et2_DOMWidget} from "./et2_core_DOMWidget"; import {et2_DOMWidget} from "./et2_core_DOMWidget";
import {etemplate2} from "./etemplate2";
/** /**
* A common dialog widget that makes it easy to imform users or prompt for information. * A common dialog widget that makes it easy to imform users or prompt for information.
@ -464,6 +465,20 @@ export class et2_dialog extends et2_widget {
// true: do NOT call et2_ready, as it would overwrite this.et2 in app.js // true: do NOT call et2_ready, as it would overwrite this.et2 in app.js
undefined, undefined, true); undefined, undefined, true);
} }
// Don't let dialog closing destroy the parent session
if(this.template.etemplate_exec_id && this.template.app)
{
for(let et of etemplate2.getByApplication(this.template.app))
{
if(et !== this.template && et.etemplate_exec_id === this.template.etemplate_exec_id)
{
// Found another template using that exec_id, don't destroy when dialog closes.
this.template.unbind_unload();
break;
}
}
}
// set template-name as id, to allow to style dialogs // set template-name as id, to allow to style dialogs
this.div.children().attr('id', template.replace(/^(.*\/)?([^/]+)(\.xet)?$/, '$2').replace(/\./g, '-')); this.div.children().attr('id', template.replace(/^(.*\/)?([^/]+)(\.xet)?$/, '$2').replace(/\./g, '-'));
} }