fixes #3426 and #3427

Closes #3426 and #3427

Merge request studip/studip!2452

lib/models/Courseware/BlockTypes/Folder.php

@@ -55,7 +55,7 @@ class Folder extends BlockType
         if ($folder) {
             $typedFolder = $folder->getTypedFolder();
             $payload['folder-type'] = $typedFolder->folder_type;
-
+            if ($typedFolder->isReadable($user->id)) {   
                 foreach ($typedFolder->getFiles() as $folderFile) {
                     $file['id'] = $folderFile->id;
                     $file['attributes'] = [
@@ -79,6 +79,7 @@ class Folder extends BlockType
                     }
                 }
             }
+        }
 
         return $payload;
     }

resources/vue/components/courseware/blocks/CoursewareFolderBlock.vue

@@ -11,6 +11,11 @@
         >
             <template #content>
                 <div v-if="currentTitle !== ''" class="cw-block-title">{{ currentTitle }}</div>
+                <courseware-companion-box
+                    v-if="folderTypeHasChanged && canEdit"
+                    mood="pointing"
+                    :msgCompanion="$gettext('Der Ordnertyp wurde nach der Erstellung des Blocks geändert! Bitte überprüfen Sie die Einstellungen.')"
+                />
                 <div v-if="isHomework" class="cw-block-folder-info">
                     <p>
                         {{
@@ -181,13 +186,13 @@ export default {
             termsOfUse: 'terms-of-use/all',
         }),
         folderType() {
-            return this.block?.attributes?.payload?.type;
+            return this.block?.attributes?.payload?.['folder-type'];
         },
         storedFolderType() {
-            return this.block?.attributes?.payload?.folder_type;
+            return this.block?.attributes?.payload?.type;
         },
         folderTypeHasChanged() {
-            return this.folderType === this.storedFolderType;
+            return this.folderType !== this.storedFolderType;
         },
         folderId() {
             return this.block?.attributes?.payload?.folder_id;