Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,16 @@ const store = useUserConfigStore()
<template>
<NcAppSettingsSection id="appearance" :name="t('files', 'Appearance')">
<NcFormBox>
<NcFormBoxSwitch
v-model="store.userConfig.show_hidden"
<NcFormBoxSwitch v-model="store.userConfig.show_hidden"
:label="t('files', 'Show hidden files')"
@update:modelValue="store.update('show_hidden', $event)" />
<NcFormBoxSwitch
v-model="store.userConfig.show_mime_column"
<NcFormBoxSwitch v-model="store.userConfig.show_mime_column"
:label="t('files', 'Show file type column')"
@update:modelValue="store.update('show_mime_column', $event)" />
<NcFormBoxSwitch
v-model="store.userConfig.show_files_extensions"
<NcFormBoxSwitch v-model="store.userConfig.show_files_extensions"
:label="t('files', 'Show file extensions')"
@update:modelValue="store.update('show_files_extensions', $event)" />
<NcFormBoxSwitch
v-model="store.userConfig.crop_image_previews"
<NcFormBoxSwitch v-model="store.userConfig.crop_image_previews"
:label="t('files', 'Crop image previews')"
@update:modelValue="store.update('crop_image_previews', $event)" />
</NcFormBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,20 @@ const store = useUserConfigStore()
</script>

<template>
<NcAppSettingsSection
id="settings"
<NcAppSettingsSection id="settings"
:name="t('files', 'General')">
<NcFormBox>
<NcFormBoxSwitch
v-model="store.userConfig.sort_favorites_first"
<NcFormBoxSwitch v-model="store.userConfig.sort_favorites_first"
:label="t('files', 'Sort favorites first')"
@update:modelValue="store.update('sort_favorites_first', $event)" />
<NcFormBoxSwitch
v-model="store.userConfig.sort_folders_first"
<NcFormBoxSwitch v-model="store.userConfig.sort_folders_first"
:label="t('files', 'Sort folders before files')"
@update:modelValue="store.update('sort_folders_first', $event)" />
<NcFormBoxSwitch
v-model="store.userConfig.folder_tree"
<NcFormBoxSwitch v-model="store.userConfig.folder_tree"
:label="t('files', 'Enable folder tree view')"
@update:modelValue="store.update('folder_tree', $event)" />
</NcFormBox>
<NcRadioGroup
v-model="store.userConfig.default_view"
<NcRadioGroup v-model="store.userConfig.default_view"
:label="t('files', 'Default view')"
@update:modelValue="store.update('default_view', $event)">
<NcRadioGroupButton :label="t('files', 'All files')" value="files" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ const apiSettings = ((window.OCA?.Files?.Settings?.settings || []) as Setting[])
</script>

<template>
<NcAppSettingsSection
v-if="apiSettings.length !== 0"
<NcAppSettingsSection v-if="apiSettings.length !== 0"
id="api-settings"
:name="t('files', 'Additional settings')">
<FilesAppSettingsLegacyApiEntry v-for="setting in apiSettings" :key="setting.name" :setting="setting" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ const store = useUserConfigStore()
<template>
<NcAppSettingsSection id="warning" :name="t('files', 'Warnings')">
<NcFormBox>
<NcFormBoxSwitch
v-model="store.userConfig.show_dialog_file_extension"
<NcFormBoxSwitch v-model="store.userConfig.show_dialog_file_extension"
:label="t('files', 'Warn before changing a file extension')"
@update:modelValue="store.update('show_dialog_file_extension', $event)" />
<NcFormBoxSwitch
v-model="store.userConfig.show_dialog_deletion"
<NcFormBoxSwitch v-model="store.userConfig.show_dialog_deletion"
:label="t('files', 'Warn before deleting a file')"
@update:modelValue="store.update('show_dialog_deletion', $event)" />
</NcFormBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ const isTwoFactorEnabled = loadState('files', 'isTwoFactorEnabled', false)
<NcAppSettingsSection id="webdav" name="WebDAV">
<NcFormBox>
<NcFormBoxCopyButton :label="t('files', 'WebDAV URL')" :value="webDavUrl" />
<NcFormBoxButton
v-if="isTwoFactorEnabled"
<NcFormBoxButton v-if="isTwoFactorEnabled"
:label="t('files', 'Create an app password')"
:description="t('files', 'Required for WebDAV authentication because Two-Factor Authentication is enabled for this account.')"
:href="appPasswordUrl"
target="_blank" />
<NcFormBoxButton
:label="t('files', 'How to access files using WebDAV')"
<NcFormBoxButton :label="t('files', 'How to access files using WebDAV')"
:href="webDavDocsUrl"
target="_blank" />
</NcFormBox>
Expand Down
2 changes: 2 additions & 0 deletions apps/files/src/models/Setting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface SettingData {
}

export default class Setting {

#name: string
#options: Required<SettingData>

Expand Down Expand Up @@ -66,4 +67,5 @@ export default class Setting {
get order() {
return this.#options.order
}

}
3 changes: 1 addition & 2 deletions apps/files/src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ async function showKeyboardShortcuts() {
</script>

<template>
<NcAppSettingsDialog
:legacy="false"
<NcAppSettingsDialog :legacy="false"
:name="t('files', 'Files settings')"
no-version
:open="open"
Expand Down
3 changes: 3 additions & 0 deletions apps/settings/src/views/SettingsPresets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ const currentPreset = ref(loadState('settings', 'settings-selected-preset', 'NON
const selectedPreset = ref(currentPreset.value)
const savingPreset = ref(false)

/**
*
*/
async function saveSelectedPreset() {
try {
savingPreset.value = true
Expand Down
4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-admin-settings-presets.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-admin-settings-presets.js.map

Large diffs are not rendered by default.

Loading