diff options
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/OC/dialogs.js | 6 | ||||
| -rw-r--r-- | core/src/components/setup/RecommendedApps.vue | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index c10f676701d..5c5e8cf5887 100644 --- a/core/src/OC/dialogs.js +++ b/core/src/OC/dialogs.js @@ -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', }) } diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue index b31e4b54ca4..f2120c28402 100644 --- a/core/src/components/setup/RecommendedApps.vue +++ b/core/src/components/setup/RecommendedApps.vue @@ -38,17 +38,16 @@ <div class="dialog-row"> <NcButton v-if="showInstallButton && !installingApps" - type="tertiary" - role="link" + data-cy-setup-recommended-apps-skip :href="defaultPageUrl" - data-cy-setup-recommended-apps-skip> + variant="tertiary"> {{ t('core', 'Skip') }} </NcButton> <NcButton v-if="showInstallButton" - type="primary" + data-cy-setup-recommended-apps-install :disabled="installingApps || !isAnyAppSelected" - data-cy-setup-recommended-apps-install> + variant="primary" @click.stop.prevent="installApps"> {{ installingApps ? t('core', 'Installing apps …') : t('core', 'Install recommended apps') }} </NcButton> |