Unverified Commit 1dcfdecb authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #19553 from davelopez/24.0_fix_libraries_folder_include_deleted 

[24.0] Fix libraries folder include deleted
parents 31c0eba7 260b55eb

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

+6 −1
Original line number Diff line number Diff line
@@ -450,7 +450,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
@@ -203,7 +203,7 @@ export default { 
            return this.folderContents.find((el) => el.type === "folder" || el.type === "file");

        },

        canDelete: function () {

            return !!(this.contains_file_or_folder && this.is_admin);

            return !!this.is_admin;

        },

        dataset_manipulation: function () {

            const Galaxy = getGalaxyInstance();