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

Etemplate: Fix unwanted row reset if box had no ID

Browse Source
This commit is contained in:
nathangray 2020-11-04 12:53:14 -07:00
parent c33a6d002d
commit 1047abe80b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Etemplate/Widget/Box.php
View File

@ -50,7 +50,7 @@ class Box extends Etemplate\Widget
$old_expand = $params[1];
if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
if ($expand['cname'] !== $cname && $cname)
if ($expand['cname'] !== $cname && trim($cname) != '')
{
$expand['cont'] =& self::get_array(self::$request->content, $cname);
$expand['cname'] = $cname;
@ -73,6 +73,11 @@ class Box extends Etemplate\Widget
// Expand children
$columns_disabled = null;
if($this->id && $this->children[0] && strpos($this->children[0]->id, '$') !== false)
{
// Need to set this so the first child can repeat
$expand['row'] = 0;
}
for($n = 0; ; ++$n)
{
if (isset($this->children[$n]))
@ -93,6 +98,8 @@ class Box extends Etemplate\Widget
break;
}
//error_log('Running ' . $method_name . ' on child ' . $n . '(' . $child . ') ['.$expand['row'] . ','.$expand['c'] . ']');
$params[0] = $cname;
$params[1] = $expand;
$disabled = $child->run($method_name, $params, $respect_disabled, $columns_disabled) === false;
}