mirror of
https://github.com/nextcloud/server.git
synced 2026-06-11 09:42:09 -04:00
Merge pull request #56492 from nextcloud/fix/stable32-npm-lint-fix
Some checks are pending
CodeQL Advanced / Analyze (actions) (push) Waiting to run
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Integration sqlite / changes (push) Waiting to run
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, --tags ~@large files_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, capabilities_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, collaboration_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, comments_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, dav_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, federation_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, file_conversions) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, filesdrop_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, ldap_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_numerical_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, remoteapi_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, routing_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, setup_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharees_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharing_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, theming_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, videoverification_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite-summary (push) Blocked by required conditions
Some checks are pending
CodeQL Advanced / Analyze (actions) (push) Waiting to run
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Integration sqlite / changes (push) Waiting to run
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, --tags ~@large files_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, capabilities_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, collaboration_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, comments_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, dav_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, federation_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, file_conversions) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, filesdrop_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, ldap_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_numerical_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, remoteapi_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, routing_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, setup_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharees_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharing_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, theming_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, videoverification_features) (push) Blocked by required conditions
Integration sqlite / integration-sqlite-summary (push) Blocked by required conditions
[stable32] Fix npm lint errors in stable32
This commit is contained in:
commit
26a0cea1b7
12 changed files with 26 additions and 36 deletions
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ export interface SettingData {
|
|||
}
|
||||
|
||||
export default class Setting {
|
||||
|
||||
#name: string
|
||||
#options: Required<SettingData>
|
||||
|
||||
|
|
@ -66,4 +67,5 @@ export default class Setting {
|
|||
get order() {
|
||||
return this.#options.order
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ async function showKeyboardShortcuts() {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<NcAppSettingsDialog
|
||||
:legacy="false"
|
||||
<NcAppSettingsDialog :legacy="false"
|
||||
:name="t('files', 'Files settings')"
|
||||
no-version
|
||||
:open="open"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
4
dist/files-main.js
vendored
4
dist/files-main.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files-main.js.map
vendored
2
dist/files-main.js.map
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue