From ba666608ddabc10e7da66f43c385038d1d0b0e53 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 30 Aug 2019 09:54:54 +0100
Subject: [PATCH] FEAT #11296 TIME 0:45 sharing subfolder + fix tu
---
src/app/folder/controllers/FolderController.php | 2 ++
test/unitTests/app/basket/BasketControllerTest.php | 2 --
test/unitTests/app/folder/FolderControllerTest.php | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index b84bec1c44d..dcc1eda7055 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -85,6 +85,8 @@ class FolderController
}
}
if (!$found) {
+ $insert['level'] = 0;
+ $insert['parent_id'] = null;
$tree[] = $insert;
}
}
diff --git a/test/unitTests/app/basket/BasketControllerTest.php b/test/unitTests/app/basket/BasketControllerTest.php
index 699d0622be3..24841723cab 100755
--- a/test/unitTests/app/basket/BasketControllerTest.php
+++ b/test/unitTests/app/basket/BasketControllerTest.php
@@ -162,8 +162,6 @@ class BasketControllerTest extends TestCase
$this->assertInternalType('array', $responseBody->allGroups);
$this->assertNotNull($responseBody->allGroups);
- $this->assertInternalType('array', $responseBody->pages);
- $this->assertNotNull($responseBody->pages);
$users = \Group\models\GroupModel::getUsersByGroupId(['select' => ['id'], 'groupId' => 'AGENT']);
$group = \Group\models\GroupModel::getByGroupId(['select' => ['id'], 'groupId' => 'AGENT']);
diff --git a/test/unitTests/app/folder/FolderControllerTest.php b/test/unitTests/app/folder/FolderControllerTest.php
index c47743d240c..6b369d2f710 100755
--- a/test/unitTests/app/folder/FolderControllerTest.php
+++ b/test/unitTests/app/folder/FolderControllerTest.php
@@ -102,7 +102,7 @@ class FolderControllerTest extends TestCase
$this->assertSame(self::$id, $responseBody->folder->id);
$this->assertSame('Mon deuxieme dossier renomme', $responseBody->folder->label);
$this->assertSame(false, $responseBody->folder->public);
- $this->assertSame(0, $responseBody->folder->parent_id);
+ $this->assertSame(null, $responseBody->folder->parent_id);
$this->assertSame(0, $responseBody->folder->level);
$this->assertInternalType('array', $responseBody->folder->sharing->entities);
$this->assertInternalType('integer', $responseBody->folder->user_id);
@@ -133,7 +133,9 @@ class FolderControllerTest extends TestCase
$this->assertNotEmpty($value->label);
$this->assertInternalType("boolean", $value->public);
$this->assertInternalType("integer", $value->user_id);
- $this->assertInternalType("integer", $value->parent_id);
+ if (!empty($value->parent_id)) {
+ $this->assertInternalType("integer", $value->parent_id);
+ }
$this->assertInternalType("integer", $value->level);
$this->assertInternalType("integer", $value->countResources);
}
--
GitLab