holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handling checkbox values in listview, handling radio values display in listview;handling the doubling of select/multiselect -cfs in advanced search, adding empty entry for radio-cfs in advanced search, allowing to edit readonly cfs when in advanced search

Browse Source
This commit is contained in:
Klaus Leithoff 2009-04-30 07:39:22 +00:00
parent 1af0e3b409
commit 842adfd6b0
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
etemplate/inc/class.customfields_widget.inc.php
View File

@ -186,11 +186,17 @@ class customfields_widget
))); )));
} elseif ($type == 'customfields-list') { } elseif ($type == 'customfields-list') {
if (isset($value[$this->prefix.$lname]) && $value[$this->prefix.$lname] !== '') { if (isset($value[$this->prefix.$lname]) && $value[$this->prefix.$lname] !== '') {
switch ((string)$field['type'])
{
case 'checkbox':
if ($value[$this->prefix.$lname]==0) break;
default:
etemplate::add_child($cell,$input =& etemplate::empty_cell('image','info.png', etemplate::add_child($cell,$input =& etemplate::empty_cell('image','info.png',
array('label'=>/*lang("custom fields").": ".*/$field['label'],'width'=>"16px", array('label'=>/*lang("custom fields").": ".*/$field['label'],'width'=>"16px",
'onclick'=>"return alert('".lang("custom fields").": ".$field['label']."');"))); 'onclick'=>"return alert('".lang("custom fields").": ".$field['label']."');")));
} }
} }
}
switch ((string)$field['type']) switch ((string)$field['type'])
{ {
@ -217,29 +223,38 @@ class customfields_widget
$select =& $input; unset($input); $select =& $input; unset($input);
$input =& etemplate::empty_cell('hbox'); $input =& etemplate::empty_cell('hbox');
etemplate::add_child($input, $select); unset($select); etemplate::add_child($input, $select); unset($select);
/* the following seem to double the select fields in advanced search.
etemplate::add_child($input, etemplate::empty_cell('select',$this->prefix.$lname,array( etemplate::add_child($input, etemplate::empty_cell('select',$this->prefix.$lname,array(
'sel_options' => $field['values'], 'sel_options' => $field['values'],
'size' => $field['rows'], 'size' => $field['rows'],
'no_lang' => True 'no_lang' => True
))); )));
*/
} }
break; break;
case 'label' : case 'label' :
$row_class = 'th'; $row_class = 'th';
break; break;
case 'radio' : case 'radio' :
$showthis = '#a#l#l#';
if (count($field['values']) == 1 && isset($field['values']['@'])) if (count($field['values']) == 1 && isset($field['values']['@']))
{ {
$field['values'] = $this->_get_options_from_file($field['values']['@']); $field['values'] = $this->_get_options_from_file($field['values']['@']);
} }
if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
if ($readonly) {
$showthis = $value[$this->prefix.$lname];
$input =& etemplate::empty_cell('hbox');
} else {
$input =& etemplate::empty_cell('groupbox'); $input =& etemplate::empty_cell('groupbox');
}
$m = 0; $m = 0;
foreach ($field['values'] as $key => $val) foreach ($field['values'] as $key => $val)
{ {
$radio = etemplate::empty_cell('radio',$this->prefix.$lname); $radio = etemplate::empty_cell('radio',$this->prefix.$lname);
$radio['label'] = $val; $radio['label'] = $val;
$radio['size'] = $key; $radio['size'] = $key;
etemplate::add_child($input,$radio); if ($showthis == '#a#l#l#' || $showthis == $key) etemplate::add_child($input,$radio);
unset($radio); unset($radio);
} }
break; break;
@ -260,7 +275,7 @@ class customfields_widget
{ {
if (array_key_exists('readonly',$field['values'])) if (array_key_exists('readonly',$field['values']))
{ {
$tmparray['readonly']='readonly'; if(!$this->advanced_search) $tmparray['readonly']='readonly';
} }
} }
$input =& etemplate::empty_cell('text',$this->prefix.$lname,$tmparray); $input =& etemplate::empty_cell('text',$this->prefix.$lname,$tmparray);
@ -272,7 +287,7 @@ class customfields_widget
); );
if (is_array($field['values']) && array_key_exists('readonly',$field['values'])) if (is_array($field['values']) && array_key_exists('readonly',$field['values']))
{ {
$tmparray['readonly']='readonly'; if(!$this->advanced_search) $tmparray['readonly']='readonly';
} }
$input =& etemplate::empty_cell('textarea',$this->prefix.$lname,$tmparray); $input =& etemplate::empty_cell('textarea',$this->prefix.$lname,$tmparray);
} }
@ -298,16 +313,19 @@ class customfields_widget
)); ));
break; break;
case 'button': // button(s) to execute javascript (label=onclick) or textinputs (empty label, readonly with neg. length) case 'button': // button(s) to execute javascript (label=onclick) or textinputs (empty label, readonly with neg. length)
// a button does not seem to be helpful in advanced search ???,
if($this->advanced_search) break;
$input =& etemplate::empty_cell('hbox'); $input =& etemplate::empty_cell('hbox');
foreach($field['values'] as $label => $js) foreach($field['values'] as $label => $js)
{ {
if (!$label) // display an readonly input if (!$label) // display an readonly input
{ {
$widget =& etemplate::empty_cell('text',$this->prefix.$lname.$label,array( $tmparray = array(
'size' => $field['len'] ? $field['len'] : 20, 'size' => $field['len'] ? $field['len'] : 20,
'readonly' => $field['len'] < 0, 'readonly' => $field['len'] < 0,
'onchange' => $js, 'onchange' => $js,
)); );
$widget =& etemplate::empty_cell('text',$this->prefix.$lname.$label,$tmparray);
} }
else else
{ {