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

Etemplate: Avoid session destruction from PBX integration

Browse Source
This commit is contained in:
nathangray 2020-10-05 12:58:50 -06:00
parent 857943720e
commit dd015a62a8
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/js/etemplate/et2_widget_url.js
View File

@ -155,7 +155,22 @@ var et2_url = /** @class */ (function (_super_1) {
.replace("%u", this.egw().user('account_lid'))
.replace("%t", this.egw().user('account_phone'));
var popup = this.egw().config("call_popup");
value = function () { egw.open_link(link, '_phonecall', popup); };
value = function (ev) {
if (popup && popup !== '_self') {
egw.open_link(link, '_phonecall', popup);
}
else {
// No popup, use AJAX. We don't care about the response.
(egw.window ? egw.window.jQuery : jQuery).ajax({
url: link,
async: true,
dataType: 'json',
type: "GET"
});
ev.preventDefault();
return false;
}
};
}
else {
// Can't make a good handler

19
api/js/etemplate/et2_widget_url.ts
View File

@ -198,7 +198,24 @@ class et2_url extends et2_textbox
.replace("%u",this.egw().user('account_lid'))
.replace("%t",this.egw().user('account_phone'));
var popup = this.egw().config("call_popup");
value = function() { egw.open_link(link, '_phonecall', popup); };
value = function(ev : Event) {
if (popup && popup !== '_self')
{
egw.open_link(link, '_phonecall', popup);
}
else
{
// No popup, use AJAX. We don't care about the response.
(egw.window?egw.window.jQuery:jQuery).ajax({
url: link,
async: true,
dataType: 'json',
type: "GET"
});
ev.preventDefault();
return false;
}
};
}
else {
// Can't make a good handler