From 51ce35ac1059ce4caa18fe9102902c947bdb1ea5 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 12 Dec 2018 16:35:40 +0100
Subject: [PATCH] FEAT #8956 Resources list back
---
src/app/resource/controllers/ResController.php | 7 ++-----
src/app/resource/models/ResModelAbstract.php | 14 ++++----------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 6e2d3b617bf..e563756fa0b 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -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)
diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php
index 2447272a2ef..cff8ac890c1 100644
--- a/src/app/resource/models/ResModelAbstract.php
+++ b/src/app/resource/models/ResModelAbstract.php
@@ -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'],
--
GitLab