From c89cc5128a0c5c8ea831f1753ab2c4864da8a2b8 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 15 May 2019 16:07:12 +0200
Subject: [PATCH] FIX Unit Test + user enable
---
apps/maarch_entreprise/indexing_searching/search_adv.php | 2 +-
test/unitTests/app/user/UserControllerTest.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php
index 30f66b7498c..29f8eeebf4d 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 179040edd86..7bde24f60c7 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);
--
GitLab