From c96b037c255165c404cfd4ef0cfa5f525a716e6d Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Tue, 15 Dec 2020 17:11:21 +0100
Subject: [PATCH] FIX #15401 TIME 0:40 fix chrono quick search + fix tu
---
src/app/search/controllers/SearchController.php | 9 ++++++---
test/unitTests/app/resource/ResControllerTest.php | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/app/search/controllers/SearchController.php b/src/app/search/controllers/SearchController.php
index 884e43be277..884c730d3fc 100644
--- a/src/app/search/controllers/SearchController.php
+++ b/src/app/search/controllers/SearchController.php
@@ -342,9 +342,12 @@ class SearchController
} else {
$fields = ['subject', 'replace(alt_identifier, \' \', \'\')', 'barcode'];
+ $quick = $body['meta']['values'];
+ $quick = str_replace(' ', '', $quick);
+
$fields = AutoCompleteController::getInsensitiveFieldsForRequest(['fields' => $fields]);
$requestDataDocument = AutoCompleteController::getDataForRequest([
- 'search' => $body['meta']['values'],
+ 'search' => $quick,
'fields' => $fields,
'where' => [],
'data' => [],
@@ -355,7 +358,7 @@ class SearchController
$fields = ['title', 'identifier'];
$fields = AutoCompleteController::getInsensitiveFieldsForRequest(['fields' => $fields]);
$requestDataAttachment = AutoCompleteController::getDataForRequest([
- 'search' => $body['meta']['values'],
+ 'search' => $quick,
'fields' => $fields,
'where' => [],
'data' => [],
@@ -372,7 +375,7 @@ class SearchController
$args['searchData'] = array_merge($args['searchData'], $requestDataAttachment['data']);
}
- if (ctype_digit(trim($body['meta']['values']))) {
+ if (ctype_digit(trim($quick))) {
$whereClause[] = 'res_id = ?';
$args['searchData'][] = trim($body['meta']['values']);
}
diff --git a/test/unitTests/app/resource/ResControllerTest.php b/test/unitTests/app/resource/ResControllerTest.php
index c4b2af4ae34..42d60c3e019 100755
--- a/test/unitTests/app/resource/ResControllerTest.php
+++ b/test/unitTests/app/resource/ResControllerTest.php
@@ -421,7 +421,7 @@ class ResControllerTest extends TestCase
$response = $resController->create($fullRequest, new \Slim\Http\Response());
$this->assertSame(400, $response->getStatusCode());
$responseBody = json_decode((string)$response->getBody(), true);
- $this->assertSame('Body documentDate is not a valid date', $responseBody['errors']);
+ $this->assertSame('Body documentDate cannot be a date in the future', $responseBody['errors']);
$body = [
'doctype' => 102,
--
GitLab