From a544578b38e6f12a4c0844d8302971be60438b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 15 Mar 2022 11:47:32 +0100 Subject: [PATCH] backspace fix --- .../js/components/FilesView/FileBrowser.vue | 19 +------------------ .../Actions/FakeRenameFileOrFolderAction.php | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue index 4b3005b2..0318686a 100644 --- a/resources/js/components/FilesView/FileBrowser.vue +++ b/resources/js/components/FilesView/FileBrowser.vue @@ -38,7 +38,7 @@ export default { ItemHandler, }, computed: { - ...mapGetters(['isVisibleSidebar', 'currentFolder', 'itemViewType', 'clipboard', 'entries', 'config', 'currentTeamFolder', 'user']), + ...mapGetters(['isVisibleSidebar', 'currentFolder', 'itemViewType', 'clipboard', 'entries', 'config']), draggedItems() { // Set opacity for dragged items if (!this.clipboard.includes(this.draggingId)) { @@ -58,27 +58,10 @@ export default { }, methods: { deleteItems() { - // Prevent delete in SharedWithMe and TeamFolders homepage - if ((this.$isThisRoute(['SharedWithMe', 'TeamFolders']) && !this.$route.params.id)) return - - // Prevent delete in SharedWithMe with visit privileges - if ((this.$isThisRoute(['SharedWithMe']) && ! this.canEdit())) return - if ((this.clipboard.length > 0 && this.$checkPermission('master')) || this.$checkPermission('editor')) { this.$store.dispatch('deleteItem') } }, - canEdit() { - if (this.currentTeamFolder && this.user) { - let member = this.currentTeamFolder.data.relationships.members.data.find( - (member) => member.data.id === this.user.data.id - ) - - return member.data.attributes.permission === 'can-edit' - } - - return false - }, uploadDroppedItems(event) { this.$uploadDraggedFiles(event, this.currentFolder.data.id) diff --git a/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php b/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php index bfe6ebea..a9205717 100644 --- a/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php +++ b/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php @@ -13,7 +13,7 @@ class FakeRenameFileOrFolderAction public function __invoke( RenameItemRequest $request, string $id, - ): array|File { + ): array { // Get item if ($request->input('type') === 'folder') { $item = Folder::where('id', $id)