diff --git a/api/js/etemplate/etemplate2.js b/api/js/etemplate/etemplate2.js index 590267e8dd..fe663ccdd7 100644 --- a/api/js/etemplate/etemplate2.js +++ b/api/js/etemplate/etemplate2.js @@ -1048,7 +1048,7 @@ var etemplate2 = /** @class */ (function () { if (data['open_target'] && !uniqueId.match(data['open_target'])) { uniqueId = data.DOMNodeID.replace('.', '-') + '-' + data['open_target']; } - var et2 = new etemplate2(node, data.data.menuaction, uniqueId); + var et2 = new etemplate2(node, data.menuaction, uniqueId); et2.load(data.name, data.url, data.data, null, null, null, data['fw-target']); return true; } diff --git a/api/js/etemplate/etemplate2.ts b/api/js/etemplate/etemplate2.ts index 442db2ecfb..3efaca2dac 100644 --- a/api/js/etemplate/etemplate2.ts +++ b/api/js/etemplate/etemplate2.ts @@ -1343,7 +1343,7 @@ export class etemplate2 { uniqueId = data.DOMNodeID.replace('.', '-') + '-' + data['open_target']; } - const et2 = new etemplate2(node, data.data.menuaction, uniqueId); + const et2 = new etemplate2(node, data.menuaction, uniqueId); et2.load(data.name, data.url, data.data, null, null, null, data['fw-target']); return true; } diff --git a/api/js/jsapi/egw.js b/api/js/jsapi/egw.js index 8c3988c53b..8edf312612 100644 --- a/api/js/jsapi/egw.js +++ b/api/js/jsapi/egw.js @@ -334,7 +334,7 @@ } }); } - var et2 = new etemplate2(node, data.data.menuaction); + var et2 = new etemplate2(node, "EGroupware\\Api\\Etemplate::ajax_process_content"); et2.load(data.name,data.url,data.data); if (typeof data.response != 'undefined') { diff --git a/api/src/Etemplate.php b/api/src/Etemplate.php index 4b6b0cfde2..fc95836631 100644 --- a/api/src/Etemplate.php +++ b/api/src/Etemplate.php @@ -207,7 +207,6 @@ class Etemplate extends Etemplate\Widget\Template 'validation_errors' => self::$validation_errors, 'langRequire' => array_values($langRequire), 'currentapp' => $currentapp, - 'menuaction' => $method.(strpos($method, '::') !== false ? '::' : '.').'et2_process', ); if (!empty($data['content']['nm']['rows']) && is_array($data['content']['nm']['rows'])) diff --git a/api/src/Json/Request.php b/api/src/Json/Request.php index ad066ae753..f51ab822ba 100644 --- a/api/src/Json/Request.php +++ b/api/src/Json/Request.php @@ -159,9 +159,6 @@ class Request case 'etemplate': // eg. ajax code in an eTemplate widget $menuaction = ($appName = 'etemplate').'.'.$className.'.'.$functionName; break; - case 'et2_process': - $menuaction = ($className=Api\Etemplate::class).'::'.($functionName='ajax_process_content'); - break; case 'template': // calling current template / framework object $menuaction = $appName.'.'.$className.'.'.$functionName; $className = get_class($GLOBALS['egw']->framework);