upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-24 19:33:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #43259 from nextcloud/fix/erroneous-nextcloud-files-update

Browse source 
[stable27] Roll back erroneous nextcloud/files update
This commit is contained in:
Marcel Klehr 2024-02-03 13:24:43 +01:00 committed by GitHub
commit b410c0fbf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_trashbin/src/services/trashbin.ts
View file

@ -21,7 +21,7 @@
*/
/* eslint-disable */
import { getCurrentUser } from '@nextcloud/auth'
import { File, Folder, davParsePermissions } from '@nextcloud/files'
import { File, Folder, parseWebdavPermissions } from '@nextcloud/files'
import { generateRemoteUrl, generateUrl } from '@nextcloud/router'
import type { FileStat, ResponseDataDetailed } from 'webdav'
@ -52,7 +52,7 @@ const data = `<?xml version="1.0"?>
const resultToNode = function(node: FileStat): File | Folder {
const permissions = davParsePermissions(node.props?.permissions)
const permissions = parseWebdavPermissions(node.props?.permissions)
const owner = getCurrentUser()?.uid as string
const previewUrl = generateUrl('/apps/files_trashbin/preview?fileId={fileid}&x=32&y=32', node.props)

4
dist/core-common.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-common.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files_trashbin-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_trashbin-main.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
package-lock.json generated
View file

@ -19,7 +19,7 @@
"@nextcloud/capabilities": "^1.0.4",
"@nextcloud/dialogs": "^4.2.4",
"@nextcloud/event-bus": "^3.0.2",
"@nextcloud/files": "^3.0.0",
"@nextcloud/files": "^3.0.0-beta.8",
"@nextcloud/initial-state": "^2.0.0",
"@nextcloud/l10n": "^2.1.0",
"@nextcloud/logger": "^2.5.0",

2
package.json
View file

@ -44,7 +44,7 @@
"@nextcloud/capabilities": "^1.0.4",
"@nextcloud/dialogs": "^4.2.4",
"@nextcloud/event-bus": "^3.0.2",
"@nextcloud/files": "^3.0.0",
"@nextcloud/files": "^3.0.0-beta.8",
"@nextcloud/initial-state": "^2.0.0",
"@nextcloud/l10n": "^2.1.0",
"@nextcloud/logger": "^2.5.0",