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

Merge pull request #53347 from nextcloud/backport/53291/stable31

Browse source 
[stable31] fix(core): correctly show displayname when picking a file
This commit is contained in:
Andy Scherzinger 2025-06-12 23:29:49 +02:00 committed by GitHub
commit 364cd02560
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/OC/dialogs.js
View file

@ -278,13 +278,13 @@ const Dialogs = {
} else {
builder.setButtonFactory((nodes, path) => {
const buttons = []
const node = nodes?.[0]?.attributes?.displayName || nodes?.[0]?.basename
const target = node || basename(path)
const [node] = nodes
const target = node?.displayname || node?.basename || basename(path)
if (type === FilePickerType.Choose) {
buttons.push({
callback: legacyCallback(callback, FilePickerType.Choose),
label: node && !this.multiSelect ? t('core', 'Choose {file}', { file: node }) : t('core', 'Choose'),
label: node && !this.multiSelect ? t('core', 'Choose {file}', { file: target }) : t('core', 'Choose'),
type: 'primary',
})
}

4
dist/core-login.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
dist/core-main.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long