starred/audiobookshelf
1
0 Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-11-13 12:23:34 +01:00
Code Issues 1.0k Packages Projects Releases 10 Wiki Activity

Merge branch 'master' into v3

Browse Source
This commit is contained in:
advplyr committed 2026-11-12 17:11:21 -06:00
2 parents 41cbcf551d 75d85e971b
commit 1d89e3a58c
2 files changed
+3 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/components/tables/collection/BookTableRow.vue
+2 -6
View File
@@ -42,7 +42,7 @@
<div v-if="userCanUpdate" class="mx-1" :class="isHovering ? '' : 'ml-6'"> <div v-if="userCanUpdate" class="mx-1" :class="isHovering ? '' : 'ml-6'">
<ui-icon-btn icon="edit" borderless @click="clickEdit" /> <ui-icon-btn icon="edit" borderless @click="clickEdit" />
</div> </div>
<div v-if="userCanDelete" class="mx-1"> <div v-if="userCanUpdate" class="mx-1">
<ui-icon-btn icon="close" borderless @click="removeClick" /> <ui-icon-btn icon="close" borderless @click="removeClick" />
</div> </div>
</div> </div>
@@ -79,8 +79,7 @@ export default {
}, },
computed: { computed: {
translateDistance() { translateDistance() {
if (!this.userCanUpdate && !this.userCanDelete) return 'translate-x-0' if (!this.userCanUpdate) return 'translate-x-0'
else if (!this.userCanUpdate || !this.userCanDelete) return '-translate-x-12'
return '-translate-x-24' return '-translate-x-24'
}, },
media() { media() {
@@ -144,9 +143,6 @@ export default {
}, },
userCanUpdate() { userCanUpdate() {
return this.$store.getters['user/getUserCanUpdate'] return this.$store.getters['user/getUserCanUpdate']
},
userCanDelete() {
return this.$store.getters['user/getUserCanDelete']
} }
}, },
methods: { methods: {
server/controllers/CollectionController.js
+1 -1
View File
@@ -446,7 +446,7 @@ class CollectionController {
if (req.method == 'DELETE' && !req.params.bookId && !req.user.canDelete) { if (req.method == 'DELETE' && !req.params.bookId && !req.user.canDelete) {
Logger.warn(`[CollectionController] User "${req.user.username}" attempted to delete without permission`) Logger.warn(`[CollectionController] User "${req.user.username}" attempted to delete without permission`)
return res.sendStatus(403) return res.sendStatus(403)
} else if ((req.method == 'PATCH' || req.method == 'POST') && !req.user.canUpdate) { } else if ((req.method == 'PATCH' || req.method == 'POST' || (req.method == 'DELETE' && req.params.bookId)) && !req.user.canUpdate) {
Logger.warn(`[CollectionController] User "${req.user.username}" attempted to update without permission`) Logger.warn(`[CollectionController] User "${req.user.username}" attempted to update without permission`)
return res.sendStatus(403) return res.sendStatus(403)
} }