From 7afb6da1c9bdbbad72ba1364daab18133dae8dae Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Thu, 14 Jul 2022 14:48:21 +0000
Subject: [PATCH] display only tbody elements with data, fixes #317
Closes #317
Merge request studip/studip!814
---
resources/assets/stylesheets/less/files.less | 7 -------
resources/vue/components/FilesTable.vue | 12 ++++++++----
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/resources/assets/stylesheets/less/files.less b/resources/assets/stylesheets/less/files.less
index 0f0f9886891..ffa72e4524d 100644
--- a/resources/assets/stylesheets/less/files.less
+++ b/resources/assets/stylesheets/less/files.less
@@ -95,13 +95,6 @@
}
}
-.subfolders .empty {
- display: none;
- &:only-child {
- display: table-row;
- }
-}
-
/* for file/edit view and file/new_edit_folder_form view: */
div.file_select_possibilities, .folder_type_select_possibilities {
@width: 100px;
diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index 6d6eff3dc49..88abdeca723 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -95,17 +95,21 @@
<th data-sort="false">{{ $gettext('Aktionen') }}</th>
</tr>
</thead>
- <tbody class="subfolders">
- <tr v-if="!hasData" class="empty">
+ <tbody v-if="!hasData">
+ <tr class="empty">
<td :colspan="numberOfColumns">
{{ $gettext('Dieser Ordner ist leer') }}
</td>
</tr>
- <tr v-else-if="displayedFolders.length + displayedFiles.length === 0" class="empty">
+ </tbody>
+ <tbody v-else-if="displayedFolders.length + displayedFiles.length === 0">
+ <tr class="empty">
<td :colspan="numberOfColumns">
<translate>Keine Ordner oder Dateien entsprechen Ihrem Filter.</translate>
</td>
</tr>
+ </tbody>
+ <tbody class="subfolders" v-if="displayedFolders.length > 0">
<tr v-for="folder in displayedFolders"
:id="'row_folder_' + folder.id "
:data-permissions="folder.permissions">
@@ -150,7 +154,7 @@
</td>
</tr>
</tbody>
- <tbody class="files">
+ <tbody class="files" v-if="displayedFiles.length > 0">
<tr v-for="file in displayedFiles"
:class="file.new ? 'new' : ''"
:id="'fileref_' + file.id"
--
GitLab