Skip to content
Snippets Groups Projects
Verified Commit 51ce35ac authored by Damien's avatar Damien
Browse files

FEAT #8956 Resources list back

parent 1f97cfc7
No related branches found
No related tags found
No related merge requests found
......@@ -491,12 +491,9 @@ class ResController
'offset' => (int)$data['offset'],
'limit' => (int)$data['limit'],
]);
$allResources = ResModel::getOnView([
'select' => [1],
'where' => [$whereClause],
]);
$count = empty($resources[0]['count']) ? 0 : $resources[0]['count'];
return $response->withJson(['resources' => $resources, 'number' => count($allResources)]);
return $response->withJson(['resources' => $resources, 'count' => $count]);
}
public function updateExternalInfos(Request $request, Response $response)
......
......@@ -45,11 +45,12 @@ abstract class ResModelAbstract
ValidatorModel::stringType($aArgs, ['clause']);
ValidatorModel::intType($aArgs, ['limit', 'offset']);
$where = ['res_view_letterbox.priority = priorities.id', 'res_view_letterbox.status = status.id', 'res_view_letterbox.dest_user = users.user_id'];
$where = ['res_view_letterbox.priority = priorities.id'];
$where[] = $aArgs['clause'];
$aResources = DatabaseModel::select([
'select' => [
'count(1) OVER()',
'alt_identifier',
'category_id',
'case_label',
......@@ -64,17 +65,10 @@ abstract class ResModelAbstract
'priorities.label as priority_label',
'process_limit_date',
'res_id',
'status.img_filename as status_icon',
'status.label_status as status_label',
'status.id as status_id',
'subject',
'type_label as doctype_label',
'user_lastname',
'user_firstname',
'users.lastname as user_dest_lastname',
'users.firstname as user_dest_firstname',
'type_label as doctype_label'
],
'table' => ['res_view_letterbox, priorities, status, users'],
'table' => ['res_view_letterbox, priorities'],
'where' => $where,
'data' => [],
'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment