FIX broken feature, compatibility with "Default search filters"
This commit is contained in:
parent
c2ebd83779
commit
a6f978c67f
1 changed files with 13 additions and 7 deletions
|
|
@ -387,13 +387,15 @@ foreach ($search as $key => $val) {
|
|||
$tmpkey = 't.' . $key;
|
||||
if ($key == 'fk_statut' && !empty($search['fk_statut'])) {
|
||||
$newarrayofstatus = array();
|
||||
foreach ($search['fk_statut'] as $key2 => $val2) {
|
||||
if (in_array($val2, array('openall', 'closeall'))) {
|
||||
continue;
|
||||
if (is_array($search['fk_statut'])) {
|
||||
foreach ($search['fk_statut'] as $key2 => $val2) {
|
||||
if (in_array($val2, array('openall', 'closeall'))) {
|
||||
continue;
|
||||
}
|
||||
$newarrayofstatus[] = $val2;
|
||||
}
|
||||
$newarrayofstatus[] = $val2;
|
||||
}
|
||||
if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
|
||||
if ($search['fk_statut'] == 'openall' || (is_array($search['fk_statut']) && in_array('openall', $search['fk_statut']))) {
|
||||
$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
|
||||
$newarrayofstatus[] = Ticket::STATUS_READ;
|
||||
$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
|
||||
|
|
@ -401,7 +403,7 @@ foreach ($search as $key => $val) {
|
|||
$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
|
||||
$newarrayofstatus[] = Ticket::STATUS_WAITING;
|
||||
}
|
||||
if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
|
||||
if ($search['fk_statut'] == 'closeall' || (is_array($search['fk_statut']) && in_array('closeall', $search['fk_statut']))) {
|
||||
$newarrayofstatus[] = Ticket::STATUS_CLOSED;
|
||||
$newarrayofstatus[] = Ticket::STATUS_CANCELED;
|
||||
}
|
||||
|
|
@ -901,7 +903,11 @@ foreach ($object->fields as $key => $val) {
|
|||
//var_dump(array_values($search[$key]));
|
||||
$selectedarray = null;
|
||||
if (!empty($search[$key])) {
|
||||
$selectedarray = array_values($search[$key]);
|
||||
if (is_array($search[$key])) {
|
||||
$selectedarray = array_values($search[$key]);
|
||||
} else {
|
||||
$selectedarray = array($search[$key]); // Compatibility with "Default search filters"
|
||||
}
|
||||
}
|
||||
print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'search_status width150 onrightofpage', 1, 0, '', '', '');
|
||||
print '</td>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue