Skip to content

Commit ec3c2e8

Browse files
authored
Merge pull request #49178 from nextcloud/backport/49143/stable28
[stable28] fix(files): view-in-folder enabled conditions
2 parents d9a54f7 + c71ee18 commit ec3c2e8

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

apps/files/src/actions/viewInFolderAction.spec.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ describe('View in folder action enabled tests', () => {
126126
expect(action.enabled).toBeDefined()
127127
expect(action.enabled!([folder], view)).toBe(false)
128128
})
129+
130+
test('Disabled for files outside the user root folder', () => {
131+
const file = new Folder({
132+
id: 1,
133+
source: 'https://cloud.domain.com/remote.php/dav/trashbin/admin/trash/image.jpg.d1731053878',
134+
owner: 'admin',
135+
permissions: Permission.READ,
136+
})
137+
138+
expect(action.enabled).toBeDefined()
139+
expect(action.enabled!([file], view)).toBe(false)
140+
})
129141
})
130142

131143
describe('View in folder action execute tests', () => {

apps/files/src/actions/viewInFolderAction.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ export const action = new FileAction({
4747
return false
4848
}
4949

50+
// Can only view files that are in the user root folder
51+
if (!node.root?.startsWith('/files')) {
52+
return false
53+
}
54+
5055
if (node.permissions === Permission.NONE) {
5156
return false
5257
}

dist/files-init.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-init.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)