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

1) preserving app_header if widget loops / reloads

Browse Source 
2) size or options field gets now expaned, one can use eg "$row_content[blah]" in it
3) killed a warning in handling of readonly
This commit is contained in:
Ralf Becker 2004-02-05 13:31:54 +00:00
parent bd460d0ea1
commit a60285870b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/inc/class.uietemplate.inc.php
View File

@ -162,7 +162,8 @@
'to_process' => $GLOBALS['phpgw_info']['etemplate']['to_process'], 'to_process' => $GLOBALS['phpgw_info']['etemplate']['to_process'],
'java_script' => $GLOBALS['phpgw_info']['etemplate']['java_script'], 'java_script' => $GLOBALS['phpgw_info']['etemplate']['java_script'],
'dom_enabled' => $GLOBALS['phpgw_info']['etemplate']['dom_enabled'], 'dom_enabled' => $GLOBALS['phpgw_info']['etemplate']['dom_enabled'],
'hooked' => $hooked != '' ? $hooked : $GLOBALS['phpgw_info']['etemplate']['hook_content'] 'hooked' => $hooked != '' ? $hooked : $GLOBALS['phpgw_info']['etemplate']['hook_content'],
'app_header' => $GLOBALS['phpgw_info']['flags']['app_header'],
),$id); ),$id);
if ($return_html) if ($return_html)
@ -241,6 +242,10 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $session_data['hooked'])); $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $session_data['hooked']));
} }
} }
if (!empty($session_data['app_header']))
{
$GLOBALS['phpgw_info']['flags']['app_header'] = $session_data['app_header'];
}
//echo "<p>process_exec($this->name): <font color=red>loop is set</font>, content=</p>\n"; _debug_array($content); //echo "<p>process_exec($this->name): <font color=red>loop is set</font>, content=</p>\n"; _debug_array($content);
$this->exec($_GET['menuaction'],$session_data['content'],$session_data['sel_options'], $this->exec($_GET['menuaction'],$session_data['content'],$session_data['sel_options'],
$session_data['readonlys'],$session_data['preserv'],$content); $session_data['readonlys'],$session_data['preserv'],$content);
@ -516,6 +521,10 @@
list(,$class) = explode(',',$cell['span']); // might be set by extension list(,$class) = explode(',',$cell['span']); // might be set by extension
$cell_options = $cell['size']; $cell_options = $cell['size'];
if (strchr($cell_options,'$'))
{
$cell_options = $this->expand_name($cell_options,$show_c,$show_row,$content['.c'],$content['.row'],$content);
}
if ($cell_options[0] == '@') if ($cell_options[0] == '@')
{ {
$cell_options = $this->get_array($content,substr($cell_options,1)); $cell_options = $this->get_array($content,substr($cell_options,1));
@ -738,6 +747,7 @@
} }
if ($readonly) if ($readonly)
{ {
if (!is_array($readonlys)) $readonlys = array();
$readonlys['__ALL__'] = True; $readonlys['__ALL__'] = True;
} }
$html = $cell['obj']->show($content,$sel_options,$readonlys,$cname,$show_c,$show_row,$cell['onchange'],$cell['tr_class']); $html = $cell['obj']->show($content,$sel_options,$readonlys,$cname,$show_c,$show_row,$cell['onchange'],$cell['tr_class']);