From 18134539fece415c3b82f11bbcae60705b858edb Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 8 Nov 2019 11:44:43 +0100
Subject: [PATCH] FIX #11750 TIME 0:30 added filter on doctypes in
getResourcesList
---
.../resource/controllers/ResourceListController.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index 87f03c477e3..e9022289ba9 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -271,14 +271,20 @@ class ResourceListController
$queryData[] = $entitiesChildren;
}
}
+ if (!empty($args['data']['doctypes'])) {
+ $table[] = 'doctypes';
+ $leftJoin[] = 'doctypes.description=res_view_letterbox.type_label';
+ $where[] = 'doctypes.type_id in (?)';
+ $queryData[] = explode(',', $args['data']['doctypes']);
+ }
if (!empty($args['data']['order']) && strpos($args['data']['order'], 'alt_identifier') !== false) {
$order = 'order_alphanum(alt_identifier) ' . explode(' ', $args['data']['order'])[1];
}
if (!empty($args['data']['order']) && strpos($args['data']['order'], 'priority') !== false) {
$order = 'priorities.order ' . explode(' ', $args['data']['order'])[1];
- $table = ['priorities'];
- $leftJoin = ['res_view_letterbox.priority = priorities.id'];
+ $table[] = 'priorities';
+ $leftJoin[] = 'res_view_letterbox.priority = priorities.id';
}
return ['table' => $table, 'leftJoin' => $leftJoin, 'where' => $where, 'queryData' => $queryData, 'order' => $order];
--
GitLab