lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-15 17:15:56 +01:00
commit 30681f9179
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/ticket/list.php
View File

@ -324,7 +324,7 @@ if ($socid > 0)
foreach ($search as $key => $val) foreach ($search as $key => $val)
{ {
if ($key == 'fk_statut') if ($key == 'fk_statut' && !empty($search['fk_statut']))
{ {
$newarrayofstatus = array(); $newarrayofstatus = array();
foreach ($search['fk_statut'] as $key2 => $val2) { foreach ($search['fk_statut'] as $key2 => $val2) {
@ -345,7 +345,7 @@ foreach ($search as $key => $val)
if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2); if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
continue; continue;
} }
if ($key == 'fk_user_assign') if ($key == 'fk_user_assign' || $key == 'fk_user_create')
{ {
if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2); if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2);
continue; continue;
@ -644,7 +644,7 @@ foreach ($object->fields as $key => $val)
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">'; print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
$formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150')); $formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
print '</td>'; print '</td>';
} elseif ($key == 'fk_user_assign') { } elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">'; print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150')); print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
print '</td>'; print '</td>';