mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-27 02:14:45 +01:00
fix: searching in customfields of type select was not working
fix: hadle search actions if they are no button
This commit is contained in:
parent
fc24544f11
commit
ffd9fec8c8
@ -195,17 +195,23 @@
|
|||||||
}
|
}
|
||||||
$extension_data['result_nm']['search_values'] = $value;
|
$extension_data['result_nm']['search_values'] = $value;
|
||||||
}
|
}
|
||||||
elseif(isset($value['action']))
|
|
||||||
{
|
|
||||||
$result = $GLOBALS['egw']->session->appsession('advanced_search_result','etemplate');
|
|
||||||
_debug_array($result);
|
|
||||||
$extension_data['msg'] = ExecMethod2($extension_data['actions'][key($value['action'])]['method'],$result);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$extension_data['result_nm'] = array_merge($extension_data['result_nm'],$value['result_nm']);
|
$extension_data['result_nm'] = array_merge($extension_data['result_nm'],$value['result_nm']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(isset($value['action']))
|
||||||
|
{
|
||||||
|
// Also inputfileds etc. could be in actions
|
||||||
|
foreach($value['action'] as $action => $label)
|
||||||
|
{
|
||||||
|
if($extension_data['actions'][$action]['type'] == 'button')
|
||||||
|
{
|
||||||
|
$result = $GLOBALS['egw']->session->appsession('advanced_search_result','etemplate');
|
||||||
|
$extension_data['msg'] = ExecMethod2($extension_data['actions'][key($value['action'])]['method'],$result);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
} }
|
||||||
|
|
||||||
function get_rows($query,&$rows,&$readonlys)
|
function get_rows($query,&$rows,&$readonlys)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user