diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php index 30f66b7498c94ecd2ddc9206ed71e7823cee2e5e..29f8eeebf4d333183b608857aa4b5a80d912ba07 100755 --- a/apps/maarch_entreprise/indexing_searching/search_adv.php +++ b/apps/maarch_entreprise/indexing_searching/search_adv.php @@ -109,7 +109,7 @@ while ($res = $stmt->fetchObject()) { array_push($queries, array('ID' => $res->query_id, 'LABEL' => $res->query_name)); } -$stmt = $conn->query('SELECT user_id, firstname, lastname, status FROM '.$_SESSION['tablename']['users']." WHERE enabled = 'Y' and status <> 'DEL' order by lastname asc"); +$stmt = $conn->query('SELECT user_id, firstname, lastname, status FROM '.$_SESSION['tablename']['users']." WHERE status != 'SPD' and status != 'DEL' order by lastname asc"); $users_list = array(); while ($res = $stmt->fetchObject()) { array_push($users_list, array('ID' => functions::show_string($res->user_id), 'NOM' => functions::show_string($res->lastname), 'PRENOM' => functions::show_string($res->firstname), 'STATUT' => $res->status)); diff --git a/test/unitTests/app/user/UserControllerTest.php b/test/unitTests/app/user/UserControllerTest.php index 179040edd86e469845c5015ab217852cd3804408..7bde24f60c7660629c33a57a0fc1af76fa0dada7 100755 --- a/test/unitTests/app/user/UserControllerTest.php +++ b/test/unitTests/app/user/UserControllerTest.php @@ -65,7 +65,6 @@ class UserControllerTest extends TestCase $this->assertSame('TEST-CLARK', $responseBody->firstname); $this->assertSame('TEST-KENT', $responseBody->lastname); $this->assertSame('OK', $responseBody->status); - $this->assertSame('Y', $responseBody->enabled); $this->assertSame(null, $responseBody->phone); $this->assertSame(null, $responseBody->mail); $this->assertSame(null, $responseBody->initials);