mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-05 05:29:13 +01:00
Clear filter button no longer needed, link-entry handles it
This commit is contained in:
parent
512acfddc9
commit
c619a5d1ec
@ -582,15 +582,7 @@ class nextmatch_widget
|
|||||||
etemplate::add_child($cell,$header);
|
etemplate::add_child($cell,$header);
|
||||||
unset($header);
|
unset($header);
|
||||||
|
|
||||||
if(!$nm_global['col_filter'][self::CF_PREFIX.$name]) {
|
|
||||||
$header =& etemplate::empty_cell('label', '');
|
$header =& etemplate::empty_cell('label', '');
|
||||||
} else {
|
|
||||||
// Add a button so they can clear this filter
|
|
||||||
$header =& etemplate::empty_cell('button', $cell_name . '[' . self::CF_PREFIX . $name . '_clear]', array(
|
|
||||||
'label' => 'search',
|
|
||||||
'size' => 'delete'
|
|
||||||
));
|
|
||||||
}
|
|
||||||
$value[self::CF_PREFIX.$name] = $field['type'] . ':' . $nm_global['col_filter'][self::CF_PREFIX.$name];
|
$value[self::CF_PREFIX.$name] = $field['type'] . ':' . $nm_global['col_filter'][self::CF_PREFIX.$name];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -942,9 +934,6 @@ class nextmatch_widget
|
|||||||
}
|
}
|
||||||
foreach($this->cfs as $name => $field) {
|
foreach($this->cfs as $name => $field) {
|
||||||
if($GLOBALS['egw_info']['apps'][$field['type']]) {
|
if($GLOBALS['egw_info']['apps'][$field['type']]) {
|
||||||
if($value_in[self::CF_PREFIX.$name.'_clear']) {
|
|
||||||
$value_in[self::CF_PREFIX.$name] = array();
|
|
||||||
}
|
|
||||||
if ((string)$value_in[self::CF_PREFIX.$name] != (string)$extension_data['old_value'][self::CF_PREFIX.$name])
|
if ((string)$value_in[self::CF_PREFIX.$name] != (string)$extension_data['old_value'][self::CF_PREFIX.$name])
|
||||||
{
|
{
|
||||||
$nm_global['filter'][self::CF_PREFIX.$name] = $value_in[self::CF_PREFIX.$name]['id'];
|
$nm_global['filter'][self::CF_PREFIX.$name] = $value_in[self::CF_PREFIX.$name]['id'];
|
||||||
|
Loading…
Reference in New Issue
Block a user