mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-25 20:31:31 +02:00
new $output_mode=5 for exec to allow validating client-side created templates, see SmallParT\\Questions\\ajax_answer()
This commit is contained in:
parent
2e5eda7eb9
commit
3eaab63bfa
@ -96,9 +96,10 @@ class Etemplate extends Etemplate\Widget\Template
|
|||||||
* 2 = echo without navbar (eg. for popups)
|
* 2 = echo without navbar (eg. for popups)
|
||||||
* 3 = return eGW independent html site
|
* 3 = return eGW independent html site
|
||||||
* 4 = json response
|
* 4 = json response
|
||||||
|
* 5 = return Request object
|
||||||
* @param string $ignore_validation if not empty regular expression for validation-errors to ignore
|
* @param string $ignore_validation if not empty regular expression for validation-errors to ignore
|
||||||
* @param array $changes change made in the last call if looping, only used internaly by process_exec
|
* @param array $changes change made in the last call if looping, only used internaly by process_exec
|
||||||
* @return string html for $output_mode == 1, else nothing
|
* @return string|Etemplate\Request html for $output_mode == 1, Etemplate\Request for $output_mode == 5, else nothing
|
||||||
*/
|
*/
|
||||||
function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
|
function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
|
||||||
{
|
{
|
||||||
@ -168,6 +169,13 @@ class Etemplate extends Etemplate\Widget\Template
|
|||||||
$this->children = array($template);
|
$this->children = array($template);
|
||||||
$template->run('beforeSendToClient', array('', array('cont'=>$content)));
|
$template->run('beforeSendToClient', array('', array('cont'=>$content)));
|
||||||
|
|
||||||
|
if ($output_mode == 5)
|
||||||
|
{
|
||||||
|
$request = self::$request;
|
||||||
|
self::$request = null;
|
||||||
|
return $request;
|
||||||
|
}
|
||||||
|
|
||||||
// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings
|
// some apps (eg. InfoLog) set app_header only in get_rows depending on filter settings
|
||||||
self::$request->app_header = $GLOBALS['egw_info']['flags']['app_header'];
|
self::$request->app_header = $GLOBALS['egw_info']['flags']['app_header'];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user