Skip to content
Snippets Groups Projects
Commit b0a4c5b9 authored by Jean-Laurent DUZANT's avatar Jean-Laurent DUZANT
Browse files

FIX #17671 TIME 1:10 remove hardDelete check from privilege && fix search with...

FIX #17671 TIME 1:10 remove hardDelete check from privilege && fix search with document status and workflow status
parent 39215341
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ class SearchController ...@@ -36,7 +36,7 @@ class SearchController
$queryParams['softDeleted'] = empty($queryParams['softDeleted']) ? false : $queryParams['softDeleted'] == 'true'; $queryParams['softDeleted'] = empty($queryParams['softDeleted']) ? false : $queryParams['softDeleted'] == 'true';
$queryParams['hardDeleted'] = empty($queryParams['hardDeleted']) ? false : $queryParams['hardDeleted'] == 'true'; $queryParams['hardDeleted'] = empty($queryParams['hardDeleted']) ? false : $queryParams['hardDeleted'] == 'true';
if (($queryParams['softDeleted'] || $queryParams['hardDeleted']) && !PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'can_purge'])) { if ($queryParams['softDeleted'] && !PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'can_purge'])) {
return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']); return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']);
} }
...@@ -134,6 +134,8 @@ class SearchController ...@@ -134,6 +134,8 @@ class SearchController
$canPurge = true; $canPurge = true;
} }
$where = [implode(' OR ', $where)];
$documents = DocumentModel::get([ $documents = DocumentModel::get([
'select' => $select, 'select' => $select,
'where' => $where, 'where' => $where,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment