From 16ac35c3f71fb2c0f3809468616fbbdbfa50974d Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 21 Oct 2019 14:20:35 +0200
Subject: [PATCH] FIX #12014 TIME 0:40 fix folder out of perimeter bugs
---
src/app/folder/controllers/FolderController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 83b5fa3e9ac..80cbdb919c8 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -226,7 +226,7 @@ class FolderController
if ($folder[0]['parent_id'] != $data['parent_id']) {
$childrenInPerimeter = FolderController::areChildrenInPerimeter(['folderId' => $aArgs['id']]);
- if ($childrenInPerimeter) {
+ if ($childrenInPerimeter || $folder[0]['user_id'] == $GLOBALS['id']) {
FolderModel::update([
'set' => [
'parent_id' => $data['parent_id'],
@@ -792,7 +792,7 @@ class FolderController
}
$folders = FolderModel::getWithEntities([
- 'select' => ['count(1)'],
+ 'select' => ['count(distinct folders.id)'],
'where' => ['folders.id in (?)', '(user_id = ? OR entity_id in (?))'],
'data' => [$args['folders'], $args['userId'], $entities]
]);
--
GitLab