upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #45131 from nextcloud/chore/location-path-prefix

Browse source 
chore: Remove All files prefix from original location
This commit is contained in:
Pytal 2024-05-02 02:32:01 -07:00 committed by GitHub
commit 1098abd399
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_trashbin/src/columns.ts
View file

@ -23,7 +23,7 @@
import moment from '@nextcloud/moment'
import { Column, Node } from '@nextcloud/files'
import { getCurrentUser } from '@nextcloud/auth'
import { dirname, joinPaths } from '@nextcloud/paths'
import { dirname } from '@nextcloud/paths'
import { translate as t } from '@nextcloud/l10n'
import Vue from 'vue'
@ -38,7 +38,7 @@ const parseOriginalLocation = (node: Node): string => {
if (dir === path) { // Node is in root folder
return t('files_trashbin', 'All files')
}
return joinPaths(t('files_trashbin', 'All files'), dir)
return dir.replace(/^\//, '')
}
interface DeletedBy {

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