Unverified Commit 3992f0f2 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.1' into release_24.2

parents 6e7f487f 3bf2c268

client/src/components/Libraries/LibraryFolder/LibraryFolder.vue

+6 −1
Original line number Diff line number Diff line
@@ -454,7 +454,12 @@ export default { 
                }

            });



            return this.selected.length + unselectable === this.$refs.folder_content_table.computedItems.length;

            const numComputedItems = this.$refs.folder_content_table.computedItems.length;

            if (numComputedItems === 0 || numComputedItems === unselectable) {

                return false;

            }



            return this.selected.length + unselectable === numComputedItems;

        },

        toggleSelect() {

            this.unselected = [];

client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ const containsFileOrFolder = computed(() => { 
    return props.folderContents.find((el) => el.type === "folder" || el.type === "file");

});

const canDelete = computed(() => {

    return !!(containsFileOrFolder.value && props.metadata.can_modify_folder);

    return !!props.metadata.can_modify_folder;

});

const datasetManipulation = computed(() => {

    return !!(containsFileOrFolder.value && userStore.currentUser);