Merge pull request #308 from nextcloud/backport/306/stable28

[stable28] fix: Show lock status for read only files and allow unlocking
nextcloud · May 10, 2024 · 80af1a9 · 80af1a9
2 parents 87b8ab9 + 83ec0b0
commit 80af1a9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -85,7 +85,7 @@ const inlineAction = new FileAction({
 		const node = nodes[0]
 		const state = getLockStateFromAttributes(node)
 
-		return (node.permissions & Permission.UPDATE) !== 0 && state.isLocked
+		return state.isLocked
 	},
 })
 
@@ -115,8 +115,10 @@ const menuAction = new FileAction({
 		}
 
 		const canToggleLock = canLock(nodes[0]) || canUnlock(nodes[0])
+		const isLocked = getLockStateFromAttributes(nodes[0]).isLocked
+		const isUpdatable = (nodes[0].permissions & Permission.UPDATE) !== 0
 
-		return nodes[0].type === FileType.File && canToggleLock && (nodes[0].permissions & Permission.UPDATE) !== 0
+		return nodes[0].type === FileType.File && canToggleLock && (isUpdatable || isLocked)
 	},
 
 	async exec(node: Node) {