diff --git a/src/app/home/controllers/HomeController.php b/src/app/home/controllers/HomeController.php index 9479f6ae4c3820c21619d419f8b4cf0043029c9c..dee9f7fe74ec39079dd29ec0a94c8b91b5aaa627 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 3cdc5e71817a6b0afe869407ccc62d46d9ec8de0..be2482460868a09c1f0b410e6b390b4d23c88357 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'];