Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>2021-07-25 18:57:11 +0300
committerJohn Molakvoæ <skjnldsv@users.noreply.github.com>2021-09-06 17:39:11 +0300
commit961f8958c0df8e60ca9fda88d5f46526534eecd9 (patch)
tree6bd65beefbd7012fd211fc3f491b8b567b8a822f /apps/files_sharing/src
parent33a0b75c83a1c56fa84b98d3a07a26b5c4932b65 (diff)
Let users choose a share_folder
Diffstat (limited to 'apps/files_sharing/src')
-rw-r--r--apps/files_sharing/src/components/PersonalSettings.vue45
-rw-r--r--apps/files_sharing/src/components/SelectShareFolderDialogue.vue125
2 files changed, 160 insertions, 10 deletions
diff --git a/apps/files_sharing/src/components/PersonalSettings.vue b/apps/files_sharing/src/components/PersonalSettings.vue
index 5ff795fc91a..526bee07324 100644
--- a/apps/files_sharing/src/components/PersonalSettings.vue
+++ b/apps/files_sharing/src/components/PersonalSettings.vue
@@ -2,6 +2,7 @@
- @copyright 2019 Roeland Jago Douma <roeland@famdouma.nl>
-
- @author 2019 Roeland Jago Douma <roeland@famdouma.nl>
+ - @author Hinrich Mahler <nextcloud@mahlerhome.de>
-
- @license GNU AGPL version 3 or any later version
-
@@ -20,9 +21,9 @@
-->
<template>
- <div v-if="!enforceAcceptShares" id="files-sharing-personal-settings" class="section">
+ <div v-if="!enforceAcceptShares || allowCustomDirectory" id="files-sharing-personal-settings" class="section">
<h2>{{ t('files_sharing', 'Sharing') }}</h2>
- <p>
+ <p v-if="!enforceAcceptShares">
<input id="files-sharing-personal-settings-accept"
v-model="accepting"
class="checkbox"
@@ -30,31 +31,55 @@
@change="toggleEnabled">
<label for="files-sharing-personal-settings-accept">{{ t('files_sharing', 'Accept user and group shares by default') }}</label>
</p>
+ <p v-if="allowCustomDirectory">
+ <SelectShareFolderDialogue />
+ </p>
</div>
</template>
<script>
-import axios from '@nextcloud/axios'
-import { loadState } from '@nextcloud/initial-state'
import { generateUrl } from '@nextcloud/router'
+import { loadState } from '@nextcloud/initial-state'
+import { showError } from '@nextcloud/dialogs'
+import axios from '@nextcloud/axios'
+
+import SelectShareFolderDialogue from './SelectShareFolderDialogue'
export default {
name: 'PersonalSettings',
+ components: {
+ SelectShareFolderDialogue,
+ },
+
data() {
return {
+ // Share acceptance config
accepting: loadState('files_sharing', 'accept_default'),
enforceAcceptShares: loadState('files_sharing', 'enforce_accept'),
+
+ // Receiving share folder config
+ allowCustomDirectory: loadState('files_sharing', 'allow_custom_share_folder'),
}
},
+
methods: {
- toggleEnabled() {
- axios.put(
- generateUrl('/apps/files_sharing/settings/defaultAccept'),
- {
+ async toggleEnabled() {
+ try {
+ await axios.put(generateUrl('/apps/files_sharing/settings/defaultAccept'), {
accept: this.accepting,
- }
- )
+ })
+ } catch (error) {
+ showError(t('sharing', 'Error while toggling options'))
+ console.error(error)
+ }
},
},
}
</script>
+
+<style scoped lang="scss">
+p {
+ margin-top: 12px;
+ margin-bottom: 12px;
+}
+</style>
diff --git a/apps/files_sharing/src/components/SelectShareFolderDialogue.vue b/apps/files_sharing/src/components/SelectShareFolderDialogue.vue
new file mode 100644
index 00000000000..99fa00cc1ba
--- /dev/null
+++ b/apps/files_sharing/src/components/SelectShareFolderDialogue.vue
@@ -0,0 +1,125 @@
+<!--
+ - @copyright 2021 Hinrich Mahler <nextcloud@mahlerhome.de>
+ -
+ - @license GNU AGPL version 3 or any later version
+ -
+ - This program is free software: you can redistribute it and/or modify
+ - it under the terms of the GNU Affero General Public License as
+ - published by the Free Software Foundation, either version 3 of the
+ - License, or (at your option) any later version.
+ -
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ - GNU Affero General Public License for more details.
+ -
+ - You should have received a copy of the GNU Affero General Public License
+ - along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<template>
+ <div class="share-folder">
+ <span>{{ t('files', 'Set default folder for accepted shares') }} </span>
+
+ <!-- Folder picking form -->
+ <form class="share-folder__form" @reset.prevent.stop="resetFolder">
+ <input class="share-folder__picker"
+ type="text"
+ :placeholder="readableDirectory"
+ @click.prevent="pickFolder">
+
+ <!-- Show reset button if folder is different -->
+ <input v-if="readableDirectory !== defaultDirectory"
+ class="share-folder__reset"
+ type="reset"
+ :value="t('files', 'Reset')"
+ :aria-label="t('files', 'Reset folder to system default')">
+ </form>
+ </div>
+</template>
+
+<script>
+import axios from '@nextcloud/axios'
+import path from 'path'
+import { generateUrl } from '@nextcloud/router'
+import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
+import { loadState } from '@nextcloud/initial-state'
+
+const defaultDirectory = loadState('files_sharing', 'default_share_folder', '/')
+const directory = loadState('files_sharing', 'share_folder', defaultDirectory)
+
+export default {
+ name: 'SelectShareFolderDialogue',
+ data() {
+ return {
+ directory,
+ defaultDirectory,
+ }
+ },
+ computed: {
+ readableDirectory() {
+ if (!this.directory) {
+ return '/'
+ }
+ return this.directory
+ },
+ },
+ methods: {
+ async pickFolder() {
+
+ // Setup file picker
+ const picker = getFilePickerBuilder(t('files', 'Choose a default folder for accepted shares'))
+ .startAt(this.readableDirectory)
+ .setMultiSelect(false)
+ .setModal(true)
+ .setType(1)
+ .setMimeTypeFilter(['httpd/unix-directory'])
+ .allowDirectories()
+ .build()
+
+ try {
+ // Init user folder picking
+ const dir = await picker.pick() || '/'
+ if (!dir.startsWith('/')) {
+ throw new Error(t('files', 'Invalid path selected'))
+ }
+
+ // Fix potential path issues and save results
+ this.directory = path.normalize(dir)
+ await axios.put(generateUrl('/apps/files_sharing/settings/shareFolder'), {
+ shareFolder: this.directory,
+ })
+ } catch (error) {
+ showError(error.message || t('files', 'Unknown error'))
+ }
+ },
+
+ resetFolder() {
+ this.directory = this.defaultDirectory
+ axios.delete(generateUrl('/apps/files_sharing/settings/shareFolder'))
+ },
+ },
+}
+</script>
+
+<style scoped lang="scss">
+.share-folder {
+ &__form {
+ display: flex;
+ }
+
+ &__picker {
+ cursor: pointer;
+ min-width: 266px;
+ }
+
+ // Make the reset button looks like text
+ &__reset {
+ background-color: transparent;
+ border: none;
+ font-weight: normal;
+ text-decoration: underline;
+ font-size: inherit;
+ }
+}
+</style>