mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-31 11:09:04 +01:00
show readonly cats without indention and global cat marker
This commit is contained in:
parent
106dab6003
commit
03630766ad
@ -106,6 +106,7 @@
|
|||||||
|
|
||||||
$extension_data['type'] = $cell['type'];
|
$extension_data['type'] = $cell['type'];
|
||||||
|
|
||||||
|
$readonly = $cell['readonly'] || $readonlys;
|
||||||
switch ($cell['type'])
|
switch ($cell['type'])
|
||||||
{
|
{
|
||||||
case 'select-percent': // options: #row,decrement(default=10)
|
case 'select-percent': // options: #row,decrement(default=10)
|
||||||
@ -166,6 +167,15 @@
|
|||||||
{
|
{
|
||||||
$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories');
|
$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories');
|
||||||
}
|
}
|
||||||
|
if ($readonly) // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
|
||||||
|
{
|
||||||
|
$cell['no_lang'] = True;
|
||||||
|
foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
|
||||||
|
{
|
||||||
|
if ($id) $cell['sel_options'][$id] = $GLOBALS['egw']->strip_html($GLOBALS['egw']->categories->id2name($id));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
foreach((array)$GLOBALS['egw']->categories->return_sorted_array(0,False,'','','',!$type) as $cat)
|
foreach((array)$GLOBALS['egw']->categories->return_sorted_array(0,False,'','','',!$type) as $cat)
|
||||||
{
|
{
|
||||||
$s = str_repeat(' ',$cat['level']) . $GLOBALS['egw']->strip_html($cat['name']);
|
$s = str_repeat(' ',$cat['level']) . $GLOBALS['egw']->strip_html($cat['name']);
|
||||||
@ -196,7 +206,7 @@
|
|||||||
foreach($GLOBALS['egw']->accounts->membership() as $group) $mygroups[] = $group['account_id'];
|
foreach($GLOBALS['egw']->accounts->membership() as $group) $mygroups[] = $group['account_id'];
|
||||||
}
|
}
|
||||||
// in case of readonly, we read/create only the needed entries, as reading accounts is expensive
|
// in case of readonly, we read/create only the needed entries, as reading accounts is expensive
|
||||||
if ($cell['readonly'] || $readonlys)
|
if ($readonly)
|
||||||
{
|
{
|
||||||
$cell['no_lang'] = True;
|
$cell['no_lang'] = True;
|
||||||
foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
|
foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
|
||||||
@ -321,7 +331,6 @@
|
|||||||
}
|
}
|
||||||
$value_in = $value;
|
$value_in = $value;
|
||||||
$value = array();
|
$value = array();
|
||||||
$readonly = $cell['readonly'] || $readonlys;
|
|
||||||
foreach($cell['sel_options'] as $val => $lable)
|
foreach($cell['sel_options'] as $val => $lable)
|
||||||
{
|
{
|
||||||
if (($value_in & $val) == $val)
|
if (($value_in & $val) == $val)
|
||||||
|
Loading…
Reference in New Issue
Block a user