mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-27 02:14:45 +01:00
Fix tabs=>extraTabs did not validate properly
This commit is contained in:
parent
9530f693e0
commit
7375768e25
@ -47,9 +47,14 @@ class Tabbox extends Etemplate\Widget
|
|||||||
$form_name = self::form_name($params[0], $this->id, $params[1]);
|
$form_name = self::form_name($params[0], $this->id, $params[1]);
|
||||||
|
|
||||||
// Make sure additional tabs are processed for any method
|
// Make sure additional tabs are processed for any method
|
||||||
if (!($tabs =& self::getElementAttribute($form_name, 'tabs')))
|
if($tabs = self::getElementAttribute($form_name, 'tabs'))
|
||||||
{
|
{
|
||||||
$tabs = $this->attrs['tabs'];
|
// tabs is not usable in webComponent, need to use extraTabs
|
||||||
|
self::setElementAttribute($form_name, 'extraTabs', $tabs);
|
||||||
|
}
|
||||||
|
if(!($tabs =& self::getElementAttribute($form_name, 'extraTabs')))
|
||||||
|
{
|
||||||
|
$tabs = $this->attrs['extraTabs'];
|
||||||
}
|
}
|
||||||
if($tabs && !$this->tabs_attr_evaluated)
|
if($tabs && !$this->tabs_attr_evaluated)
|
||||||
{
|
{
|
||||||
@ -73,7 +78,7 @@ class Tabbox extends Etemplate\Widget
|
|||||||
}
|
}
|
||||||
unset($tab);
|
unset($tab);
|
||||||
//error_log(__METHOD__."('$method_name', ...) this->id='$this->id' calling setElementAttribute('$form_name', 'tabs', ".array2string($tabs).")");
|
//error_log(__METHOD__."('$method_name', ...) this->id='$this->id' calling setElementAttribute('$form_name', 'tabs', ".array2string($tabs).")");
|
||||||
self::setElementAttribute($form_name, 'tabs', $tabs);
|
self::setElementAttribute($form_name, 'extraTabs', $tabs);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for disabled tabs set via readonly, and set them as disabled
|
// Check for disabled tabs set via readonly, and set them as disabled
|
||||||
|
Loading…
Reference in New Issue
Block a user