From 8cb5af184e7ea3fe8a684a1d589c704ed420402c Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Wed, 28 Oct 2020 16:54:04 +0100
Subject: [PATCH] FEAT #15056 TIME 0:25 added retentionFrozen + binding to
folder + follow
---
src/app/folder/controllers/FolderController.php | 4 +---
.../resource/controllers/UserFollowedResourceController.php | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 4d80e2cd6a2..03e9ef2174f 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -15,7 +15,6 @@
namespace Folder\controllers;
use Attachment\models\AttachmentModel;
-use Basket\models\BasketModel;
use Entity\models\EntityModel;
use Folder\models\EntityFolderModel;
use Folder\models\FolderModel;
@@ -31,7 +30,6 @@ use Resource\models\UserFollowedResourceModel;
use Respect\Validation\Validator;
use Slim\Http\Request;
use Slim\Http\Response;
-use SrcCore\controllers\PreparedClauseController;
use SrcCore\models\DatabaseModel;
use SrcCore\models\ValidatorModel;
use User\models\UserEntityModel;
@@ -715,7 +713,7 @@ class FolderController
$select = [
'res_letterbox.res_id', 'res_letterbox.subject', 'res_letterbox.barcode', 'res_letterbox.alt_identifier',
'status.label_status AS "status.label_status"', 'status.img_filename AS "status.img_filename"', 'priorities.color AS "priorities.color"',
- 'res_letterbox.filename as res_filename'
+ 'res_letterbox.filename as res_filename', 'res_letterbox.retention_frozen', 'res_letterbox.binding'
];
$tableFunction = ['status', 'priorities'];
$leftJoinFunction = ['res_letterbox.status = status.id', 'res_letterbox.priority = priorities.id'];
diff --git a/src/app/resource/controllers/UserFollowedResourceController.php b/src/app/resource/controllers/UserFollowedResourceController.php
index 97f0567a590..5e01b758721 100644
--- a/src/app/resource/controllers/UserFollowedResourceController.php
+++ b/src/app/resource/controllers/UserFollowedResourceController.php
@@ -125,7 +125,7 @@ class UserFollowedResourceController
$select = [
'res_letterbox.res_id', 'res_letterbox.subject', 'res_letterbox.barcode', 'res_letterbox.alt_identifier',
'status.label_status AS "status.label_status"', 'status.img_filename AS "status.img_filename"', 'priorities.color AS "priorities.color"',
- 'res_letterbox.filename as res_filename'
+ 'res_letterbox.filename as res_filename', 'res_letterbox.retention_frozen', 'res_letterbox.binding'
];
$tableFunction = ['status', 'priorities'];
$leftJoinFunction = ['res_letterbox.status = status.id', 'res_letterbox.priority = priorities.id'];
--
GitLab