From db3b3a3ff564060e8551908cff883e4f8278fff0 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 6 Dec 2019 10:18:35 +0100
Subject: [PATCH] FEAT #12331 TIME 0:10 fixed folder ids returned in get
---
src/app/resource/controllers/ResController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 87e4f0e6cd6..2ea624583d3 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -213,11 +213,11 @@ class ResController
]);
$entities = array_column($entities, 'id');
$folders = FolderModel::getWithEntitiesAndResources([
- 'select' => ['resources_folders.id'],
+ 'select' => ['resources_folders.folder_id'],
'where' => ['resources_folders.res_id = ?', '(entities_folders.entity_id in (?) OR folders.user_id = ?)'],
'data' => [$args['resId'], $entities, $GLOBALS['id']]
]);
- $formattedData['folders'] = array_column($folders, 'id');
+ $formattedData['folders'] = array_column($folders, 'folder_id');
$tags = TagResModel::get(['select' => ['tag_id'], 'where' => ['res_id = ?'], 'data' => [$args['resId']]]);
$formattedData['tags'] = array_column($tags, 'tag_id');
--
GitLab