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

Fix: Filter on status

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-30 12:32:19 +02:00
parent 040f80b0f6
commit 3c4dfba99e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/user/index.php
View File

@ -42,7 +42,6 @@ if ($user->societe_id > 0)
$sall=GETPOST('sall','alpha'); $sall=GETPOST('sall','alpha');
$search_user=GETPOST('search_user','alpha'); $search_user=GETPOST('search_user','alpha');
$search_statut=GETPOST('search_statut','alpha'); $search_statut=GETPOST('search_statut','alpha');
if ($search_statut=='') $search_statut=1; // always display activ customer first
$sortfield = GETPOST('sortfield','alpha'); $sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha'); $sortorder = GETPOST('sortorder','alpha');
@ -82,14 +81,14 @@ if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf
} }
else else
{ {
$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " WHERE u.entity IN (".getEntity('user',1).")";
} }
if (! empty($socid)) $sql.= " AND u.fk_societe = ".$socid; if (! empty($socid)) $sql.= " AND u.fk_societe = ".$socid;
if (! empty($search_user)) if (! empty($search_user))
{ {
$sql.= " AND (u.login LIKE '%".$db->escape($search_user)."%' OR u.lastname LIKE '%".$db->escape($search_user)."%' OR u.firstname LIKE '%".$db->escape($search_user)."%')"; $sql.= " AND (u.login LIKE '%".$db->escape($search_user)."%' OR u.lastname LIKE '%".$db->escape($search_user)."%' OR u.firstname LIKE '%".$db->escape($search_user)."%')";
} }
if ($search_statut!='') if ($search_statut != '' && $search_statut >= 0)
{ {
$sql.= " AND (u.statut=".$search_statut.")"; $sql.= " AND (u.statut=".$search_statut.")";
} }
@ -104,7 +103,9 @@ if ($result)
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n"; print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
$param="search_user=$search_user&amp;sall=$sall"; $param="search_user=".$search_user."&sall=".$sall;
$param.="&search_statut=".$search_statut;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Login"),"index.php","u.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Login"),"index.php","u.login",$param,"","",$sortfield,$sortorder);
@ -121,8 +122,9 @@ if ($result)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="6">&nbsp;</td>'; print '<td colspan="6">&nbsp;</td>';
// Status
print '<td>'; print '<td>';
print $form->selectarray('search_statut', array('0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut); print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
print '</td>'; print '</td>';
print '<td class="liste_titre" align="right">'; print '<td class="liste_titre" align="right">';