mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-13 08:50:07 +01:00
- fixed problem with auto-repeated rows not working everytime
- allow for first name-parts for select-options
This commit is contained in:
parent
07da6bbec9
commit
554a3e93bb
@ -334,9 +334,9 @@
|
|||||||
{
|
{
|
||||||
if (!(list($r_key) = each($this->data))) // no further row
|
if (!(list($r_key) = each($this->data))) // no further row
|
||||||
{
|
{
|
||||||
if (!($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) &&
|
if (!(($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) ||
|
||||||
!($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname) ||
|
($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname)) ||
|
||||||
!$this->isset_array($content,$idx))
|
!$this->isset_array($content,$idx_cname))
|
||||||
{
|
{
|
||||||
break; // no auto-row-repeat
|
break; // no auto-row-repeat
|
||||||
}
|
}
|
||||||
@ -784,6 +784,10 @@
|
|||||||
{
|
{
|
||||||
$sels += $sel_options[$org_name];
|
$sels += $sel_options[$org_name];
|
||||||
}
|
}
|
||||||
|
elseif (isset($sel_options[$name_parts[0]]) && is_array($sel_options[$name_parts[0]]))
|
||||||
|
{
|
||||||
|
$sels += $sel_options[$name_parts[0]];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (isset($content["options-$name"]))
|
if (isset($content["options-$name"]))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user