Raumverwaltung: Fehler bei Dokumenten in Räumen, fixes #2829

Closes #2829

Merge request !2208

app/controllers/file.php

@@ -149,6 +149,10 @@ class FileController extends AuthenticatedController
                     $changes['redirect'] = $this->url_for("file/edit_license/{$folder->getId()}", [
                         'file_refs' => $ref_ids,
                     ]);
+                } elseif ($folder->range_type === 'Resource') {
+                    $changes['close_dialog'] = [
+                        'reload-on-close' => true
+                    ];
                 } else {
                     $changes['close_dialog'] = true;
                 }

app/controllers/resources/resource.php

@@ -1471,5 +1471,7 @@ class Resources_ResourceController extends AuthenticatedController
 
         //Set the last visit date to the current timestamp:
         $this->last_visitdate = time();
+
+        $this->show_bulk_checkboxes = true;
     }
 }

app/views/resources/resource/_standard_properties_display_part.php

@@ -24,7 +24,7 @@
 
             <table class="default">
                 <colgroup>
-                    <col style="width: 70%">
+                    <col style="width: 30%">
                     <col>
                 </colgroup>
                 <thead>

app/views/resources/resource/files.php

@@ -70,16 +70,16 @@
                                     ]
                                 ) ?>
                             <? endif ?>
-                            <? if ($folder->isWritable($GLOBALS['user']->id)): ?>
-                                <?= Studip\LinkButton::create(
-                                    _('Dokument hinzufügen'),
-                                    '#',
-                                    [
-                                        'onclick' => 'STUDIP.Files.openAddFilesWindow(); return false;'
-                                    ]
-                                ) ?>
-                            <? endif ?>
                         </span>
+                        <? if ($folder->isWritable($GLOBALS['user']->id)): ?>
+                            <?= Studip\LinkButton::create(
+                                _('Dokument hinzufügen'),
+                                '#',
+                                [
+                                    'onclick' => 'STUDIP.Files.openAddFilesWindow(); return false;'
+                                ]
+                            ) ?>
+                        <? endif ?>
                     </td>
                 </tr>
             </tfoot>

app/views/resources/room/index.php

@@ -51,10 +51,6 @@
             <h1><?= _('Dateien') ?></h1>
         </header>
         <table class="default sortable-table" data-sortlist="[[2, 0]]">
-            <colgroup>
-                <col style="width: 70%">
-                <col>
-            </colgroup>
             <?= $this->render_partial('files/_files_thead') ?>
             <? foreach ($resource_folder->getFiles() as $file): ?>
                 <? if ($file->isVisible($GLOBALS['user']->id)) : ?>

lib/filesystem/StandardFile.php

@@ -298,6 +298,7 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
             $this->isEditable($GLOBALS['user']->id)
             && Config::get()->OERCAMPUS_ENABLED
             && $GLOBALS['perm']->have_perm(Config::get()->OER_PUBLIC_STATUS)
+            && in_array($this->fileref->folder->range_type, ['course', 'user'])
         ) {
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/share_oer/' . $this->fileref->id),
@@ -311,6 +312,7 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
             $GLOBALS['user']->id !== 'nobody' && $this->fileref->user_id !== $GLOBALS['user']->id &&
             !$this->isEditable($GLOBALS['user']->id) &&
             in_array($this->fileref->content_terms_of_use_id, ['SELFMADE_NONPUB', 'FREE_LICENSE'])
+            && $this->fileref->folder->range_type === 'course'
         ) {
             $actionMenu->addLink(
                 URLHelper::getURL('dispatch.php/file/suggest_oer/' . $this->fileref->id),

resources/assets/javascripts/lib/files.js

@@ -241,6 +241,11 @@ const Files = {
     },
 
     addFileDisplay: (html, delay = 0) => {
+        // Prevent undefined filesapp errors
+        if (STUDIP.Files.filesapp === undefined) {
+            return;
+        }
+
         if (!Array.isArray(html)) {
             html = html === null ? [] : [html];
         }