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

Fix filters on contact list must always appear

Browse Source
This commit is contained in:
Maxime Kohlhaas 2017-11-29 20:04:15 +01:00
parent 33032a5474
commit 879a0812d7
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
htdocs/core/lib/company.lib.php
View File

@ -842,42 +842,39 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
$colspan=9; $colspan=9;
if ($num || (GETPOST('button_search','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search_x','alpha'))) print '<tr class="liste_titre">';
{
print '<tr class="liste_titre">';
// Photo - Name // Photo - Name
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '<input type="text" class="flat minwidth75" name="search_name" value="'.dol_escape_htmltag($search_name).'">'; print '<input type="text" class="flat minwidth75" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
print '</td>'; print '</td>';
// Position // Position
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '</td>'; print '</td>';
// Address - Phone - Email // Address - Phone - Email
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
// Status // Status
print '<td class="liste_titre maxwidthonsmartphone">'; print '<td class="liste_titre maxwidthonsmartphone">';
print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status); print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
print '</td>'; print '</td>';
// Add to agenda // Add to agenda
if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
{ {
$colspan++; $colspan++;
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
} }
// Action // Action
print '<td class="liste_titre" align="right">'; print '<td class="liste_titre" align="right">';
$searchpicto=$form->showFilterButtons(); $searchpicto=$form->showFilterButtons();
print $searchpicto; print $searchpicto;
print '</td>'; print '</td>';
print "</tr>"; print "</tr>";
}
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder); print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);