Merge branch 'rlucke/studip-BIEST#312'

lib/models/Courseware/BlockTypes/BlockType.php

@@ -303,9 +303,9 @@ abstract class BlockType
     protected function copyFileById(string $fileId, string $rangeId): string
     {
         $user = \User::findCurrent();
-
+        if ($file_ref = \FileRef::find($fileId)) {
             $copiedFile = \FileManager::copyFile(
-            \FileRef::find($fileId)->getFiletype(),
+                $file_ref->getFiletype(),
                 $this->getDestinationFolder($user, $rangeId),
                 $user
             );
@@ -313,6 +313,9 @@ abstract class BlockType
             return $copiedFile->id;
         }
 
+        return '';
+    }
+
     /**
      * Copies a folder to a specified range.
      *
@@ -325,9 +328,9 @@ abstract class BlockType
     {
         $user = \User::findCurrent();
         $destinationFolder = $this->getDestinationFolder($user, $rangeId);
-        $sourceFolder = \Folder::find($folderId)->getTypedFolder();
+        if ($sourceFolder = \Folder::find($folderId)) {
             $copiedFolder = \FileManager::copyFolder(
-            $sourceFolder,
+                $sourceFolder->getTypedFolder(),
                 $destinationFolder,
                 $user
             );
@@ -335,6 +338,9 @@ abstract class BlockType
             return $copiedFolder->id;
         }
 
+        return '';
+    }
+
     private function getDestinationFolder(\User $user, string $rangeId): \StandardFolder
     {
         $rootFolder = \Folder::findTopFolder($rangeId);

resources/assets/stylesheets/scss/courseware.scss

@@ -2223,6 +2223,7 @@ m a n a g e r
     .cw-manager-element-title {
 
         img {
+            cursor: pointer;
             vertical-align: text-bottom;
         }
 

resources/vue/components/courseware/CoursewareManagerElement.vue

 <template>
     <div class="cw-manager-element">
         <div v-if="currentElement">
+            <courseware-companion-box v-if="insertingInProgress" :msgCompanion="text.inProgress" mood="pointing" />
             <div class="cw-manager-element-title">
                 <div class="cw-manager-element-breadcrumb">
                     <span
@@ -112,6 +113,7 @@ import CoursewareCollapsibleBox from './CoursewareCollapsibleBox.vue';
 import CoursewareManagerContainer from './CoursewareManagerContainer.vue';
 import CoursewareManagerElementItem from './CoursewareManagerElementItem.vue';
 import CoursewareManagerFiling from './CoursewareManagerFiling.vue';
+import CoursewareCompanionBox from './CoursewareCompanionBox.vue';
 import { mapActions, mapGetters } from 'vuex';
 import { forEach } from 'jszip';
 
@@ -122,6 +124,7 @@ export default {
         CoursewareManagerContainer,
         CoursewareManagerElementItem,
         CoursewareManagerFiling,
+        CoursewareCompanionBox,
         StudipIcon,
     },
     props: {
@@ -151,6 +154,9 @@ export default {
             sortArrayContainers: [],
             discardStateArrayContainers: [],
             insertingInProgress: false,
+            text: {
+                inProgress: this.$gettext('Vorgang läuft. Bitte warten Sie einen Moment.')
+            },
         };
     },
     computed: {