extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-23 19:31:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

some widgets have label as second option (column name with _ as first),

Browse Source 
not a perfect detection ...
This commit is contained in:
Ralf Becker 2009-09-28 12:52:50 +00:00
parent 90cba9cb0e
commit d6aaaf1f73
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -477,7 +477,7 @@ class nextmatch_widget
$value['selectcols'] = array_keys($value['options-selectcols']); $value['selectcols'] = array_keys($value['options-selectcols']);
if (isset($value['default_cols'])) if (isset($value['default_cols']))
{ {
if ($value['default_cols']{0} == '!') if ($value['default_cols'][0] == '!')
{ {
$value['selectcols'] = array_diff($value['selectcols'],explode(',',substr($value['default_cols'],1))); $value['selectcols'] = array_diff($value['selectcols'],explode(',',substr($value['default_cols'],1)));
} }
@ -698,11 +698,14 @@ class nextmatch_widget
if (in_array($subtype,array('customfilter','sortheader'))) $subtype = array_shift($options); if (in_array($subtype,array('customfilter','sortheader'))) $subtype = array_shift($options);
$label = $options[0]; $label = $options[0];
// some widgets have label as second option (column name with _ as first), not a perfect detection ...
if (strpos($label,'_') !== false && !empty($options[1])) $label = $options[1];
} }
list(,,$col,$sub) = explode('/',$path); list(,,$col,$sub) = explode('/',$path);
$row = (int)$col; $row = (int)$col;
$col = substr($col,$row > 9 ? 2 : 1); $col = substr($col,$row > 9 ? 2 : 1);
if (($label{0} == '@' || strchr($lable,'$') !== false) && is_array($cols['__content__'])) if (($label[0] == '@' || strchr($lable,'$') !== false) && is_array($cols['__content__']))
{ {
$label = etemplate::expand_name($label,$col,$row,'','',$cols['__content__']); $label = etemplate::expand_name($label,$col,$row,'','',$cols['__content__']);
} }