Skip to content

Commit 75935b8

Browse files
authored
Merge pull request #44803 from nextcloud/fix/smartpicker-file-picker
2 parents 5dde651 + c7c7b5b commit 75935b8

File tree

8 files changed

+40
-31
lines changed

8 files changed

+40
-31
lines changed

apps/files/src/views/FileReferencePickerElement.vue

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
-->
2222

2323
<template>
24-
<FilePicker :buttons="buttons"
24+
<FilePicker allow-pick-directory
25+
:buttons="buttons"
2526
:container="null"
2627
:name="t('files', 'Select file or folder to link to')"
2728
:multiselect="false"
28-
@close="$emit('cancel')" />
29+
@close="onClose" />
2930
</template>
3031

3132
<script>
@@ -48,24 +49,32 @@ export default {
4849
default: false,
4950
},
5051
},
51-
data() {
52-
return {
53-
buttons: [
54-
{
55-
label: t('files', 'Choose'),
56-
type: 'primary',
57-
callback: (nodes) => {
58-
logger.debug('FileReferencePicker - Nodes picked', { nodes })
59-
this.submit(nodes[0].fileid)
60-
},
52+
53+
setup() {
54+
// Buttons to show
55+
const buttons = [
56+
{
57+
label: t('files', 'Choose'),
58+
type: 'primary',
59+
callback: (nodes) => {
60+
logger.debug('FileReferencePicker - Nodes picked', { nodes })
6161
},
62-
],
62+
},
63+
]
64+
65+
return {
66+
buttons,
6367
}
6468
},
69+
6570
methods: {
66-
submit(fileId) {
67-
const fileLink = `${window.location.protocol}//${window.location.host}${generateUrl('/f/{fileId}', { fileId })}`
68-
this.$emit('submit', fileLink)
71+
onClose(selectedNodes) {
72+
if (!selectedNodes || selectedNodes.length === 0) {
73+
this.$emit('cancel')
74+
} else {
75+
const fileLink = `${window.location.protocol}//${window.location.host}${generateUrl('/f/{fileId}', { fileId: selectedNodes[0].fileid })}`
76+
this.$emit('submit', fileLink)
77+
}
6978
},
7079
},
7180
}

core/css/server.css

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

dist/core-common.js

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

dist/core-common.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.

dist/files-reference-files.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-reference-files.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.

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@nextcloud/browserslist-config": "^2.3.0",
4343
"@nextcloud/calendar-availability-vue": "^0.6.0-alpha1",
4444
"@nextcloud/capabilities": "^1.0.4",
45-
"@nextcloud/dialogs": "^4.2.6",
45+
"@nextcloud/dialogs": "^4.2.7",
4646
"@nextcloud/event-bus": "^3.0.2",
4747
"@nextcloud/files": "3.0.0-beta.8",
4848
"@nextcloud/initial-state": "^2.0.0",

0 commit comments

Comments
 (0)