From f3b6d877af9f3ae32697e51910cf92226faac428 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 2 Jul 2019 17:22:20 +0200
Subject: [PATCH] FEAT #10762 TIME 0:20 Get confidentiality
---
src/app/home/controllers/HomeController.php | 1 +
.../controllers/ResourceListController.php | 21 ++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/app/home/controllers/HomeController.php b/src/app/home/controllers/HomeController.php
index 9479f6ae4c3..dee9f7fe74e 100755
--- a/src/app/home/controllers/HomeController.php
+++ b/src/app/home/controllers/HomeController.php
@@ -106,6 +106,7 @@ class HomeController
'priorities.color as priority_color',
'mlb.process_limit_date',
'r.res_id',
+ 'r.confidentiality',
'status.img_filename as status_icon',
'status.label_status as status_label',
'status.id as status_id',
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index 3cdc5e71817..be248246086 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -111,7 +111,7 @@ class ResourceListController
$select = [
'res_letterbox.res_id', 'res_letterbox.subject', 'res_letterbox.barcode', 'mlb_coll_ext.alt_identifier',
'status.label_status AS "status.label_status"', 'status.img_filename AS "status.img_filename"', 'priorities.color AS "priorities.color"',
- 'mlb_coll_ext.closing_date', 'res_letterbox.locker_user_id', 'res_letterbox.locker_time'
+ 'mlb_coll_ext.closing_date', 'res_letterbox.locker_user_id', 'res_letterbox.locker_time', 'res_letterbox.confidentiality'
];
$tableFunction = ['status', 'mlb_coll_ext', 'priorities'];
$leftJoinFunction = ['res_letterbox.status = status.id', 'res_letterbox.res_id = mlb_coll_ext.res_id', 'res_letterbox.priority = priorities.id'];
@@ -151,15 +151,16 @@ class ResourceListController
]);
foreach ($resources as $key => $resource) {
- $formattedResources[$key]['res_id'] = $resource['res_id'];
- $formattedResources[$key]['alt_identifier'] = $resource['alt_identifier'];
- $formattedResources[$key]['barcode'] = $resource['barcode'];
- $formattedResources[$key]['subject'] = $resource['subject'];
- $formattedResources[$key]['statusLabel'] = $resource['status.label_status'];
- $formattedResources[$key]['statusImage'] = $resource['status.img_filename'];
- $formattedResources[$key]['priorityColor'] = $resource['priorities.color'];
- $formattedResources[$key]['closing_date'] = $resource['closing_date'];
- $formattedResources[$key]['countAttachments'] = 0;
+ $formattedResources[$key]['res_id'] = $resource['res_id'];
+ $formattedResources[$key]['alt_identifier'] = $resource['alt_identifier'];
+ $formattedResources[$key]['barcode'] = $resource['barcode'];
+ $formattedResources[$key]['subject'] = $resource['subject'];
+ $formattedResources[$key]['confidentiality'] = $resource['confidentiality'];
+ $formattedResources[$key]['statusLabel'] = $resource['status.label_status'];
+ $formattedResources[$key]['statusImage'] = $resource['status.img_filename'];
+ $formattedResources[$key]['priorityColor'] = $resource['priorities.color'];
+ $formattedResources[$key]['closing_date'] = $resource['closing_date'];
+ $formattedResources[$key]['countAttachments'] = 0;
foreach ($attachments as $attachment) {
if ($attachment['res_id_master'] == $resource['res_id']) {
$formattedResources[$key]['countAttachments'] = $attachment['count'];
--
GitLab