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

Revert "use $method parameter of Api\Etemplate::exec() plus new et2_process handler as menuaction GET parameter"

Browse Source 
This reverts commit 5576048f95.
This commit is contained in:
Hadi Nategh 2022-01-10 10:11:23 +01:00
parent 02342f48c3
commit b1de5e3881
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/etemplate2.js
View File

@ -1048,7 +1048,7 @@ var etemplate2 = /** @class */ (function () {
if (data['open_target'] && !uniqueId.match(data['open_target'])) { if (data['open_target'] && !uniqueId.match(data['open_target'])) {
uniqueId = data.DOMNodeID.replace('.', '-') + '-' + 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']); et2.load(data.name, data.url, data.data, null, null, null, data['fw-target']);
return true; return true;
} }

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

@ -1343,7 +1343,7 @@ export class etemplate2
{ {
uniqueId = data.DOMNodeID.replace('.', '-') + '-' + data['open_target']; 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']); et2.load(data.name, data.url, data.data, null, null, null, data['fw-target']);
return true; return true;
} }

2
api/js/jsapi/egw.js
View File

@ -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); et2.load(data.name,data.url,data.data);
if (typeof data.response != 'undefined') if (typeof data.response != 'undefined')
{ {

1
api/src/Etemplate.php
View File

@ -207,7 +207,6 @@ class Etemplate extends Etemplate\Widget\Template
'validation_errors' => self::$validation_errors, 'validation_errors' => self::$validation_errors,
'langRequire' => array_values($langRequire), 'langRequire' => array_values($langRequire),
'currentapp' => $currentapp, 'currentapp' => $currentapp,
'menuaction' => $method.(strpos($method, '::') !== false ? '::' : '.').'et2_process',
); );
if (!empty($data['content']['nm']['rows']) && is_array($data['content']['nm']['rows'])) if (!empty($data['content']['nm']['rows']) && is_array($data['content']['nm']['rows']))

3
api/src/Json/Request.php
View File

@ -159,9 +159,6 @@ class Request
case 'etemplate': // eg. ajax code in an eTemplate widget case 'etemplate': // eg. ajax code in an eTemplate widget
$menuaction = ($appName = 'etemplate').'.'.$className.'.'.$functionName; $menuaction = ($appName = 'etemplate').'.'.$className.'.'.$functionName;
break; break;
case 'et2_process':
$menuaction = ($className=Api\Etemplate::class).'::'.($functionName='ajax_process_content');
break;
case 'template': // calling current template / framework object case 'template': // calling current template / framework object
$menuaction = $appName.'.'.$className.'.'.$functionName; $menuaction = $appName.'.'.$className.'.'.$functionName;
$className = get_class($GLOBALS['egw']->framework); $className = get_class($GLOBALS['egw']->framework);