diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-07-17 23:16:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-17 23:16:31 +0200 |
| commit | 74ff1c64f0b60af50301650c25d0953e502e3faa (patch) | |
| tree | 46114307208c7dbbcb0c4dd2ed7c114fb17ebb54 | |
| parent | 2120a5059cfa7a43da19f779bd145416de5ee773 (diff) | |
| parent | f3857f705db3dc28901cd888223b33eb13ad47df (diff) | |
| download | nextcloud-server-74ff1c64f0b60af50301650c25d0953e502e3faa.tar.gz nextcloud-server-74ff1c64f0b60af50301650c25d0953e502e3faa.zip | |
Merge pull request #53979 from nextcloud/fix/settings-share-folder
fix(files_sharing): ensure share folder exists in the settings
| -rw-r--r-- | apps/files_sharing/lib/Settings/Personal.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_sharing/lib/Settings/Personal.php b/apps/files_sharing/lib/Settings/Personal.php index e2146017dd5..171131b1819 100644 --- a/apps/files_sharing/lib/Settings/Personal.php +++ b/apps/files_sharing/lib/Settings/Personal.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace OCA\Files_Sharing\Settings; use OCA\Files_Sharing\AppInfo\Application; +use OCA\Files_Sharing\Helper; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Services\IInitialState; use OCP\IConfig; @@ -25,16 +26,18 @@ class Personal implements ISettings { public function getForm(): TemplateResponse { $defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes'; - $shareFolderSystemConfig = $this->config->getSystemValue('share_folder', '/'); + $defaultShareFolder = $this->config->getSystemValue('share_folder', '/'); + $userShareFolder = Helper::getShareFolder(userId: $this->userId); $acceptDefault = $this->config->getUserValue($this->userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes'; $enforceAccept = $this->config->getSystemValueBool('sharing.force_share_accept', false); $allowCustomDirectory = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true); - $shareFolderDefault = $this->config->getUserValue($this->userId, Application::APP_ID, 'share_folder', $shareFolderSystemConfig); + $this->initialState->provideInitialState('accept_default', $acceptDefault); $this->initialState->provideInitialState('enforce_accept', $enforceAccept); $this->initialState->provideInitialState('allow_custom_share_folder', $allowCustomDirectory); - $this->initialState->provideInitialState('share_folder', $shareFolderDefault); - $this->initialState->provideInitialState('default_share_folder', $shareFolderSystemConfig); + $this->initialState->provideInitialState('default_share_folder', $defaultShareFolder); + $this->initialState->provideInitialState('share_folder', $userShareFolder); + return new TemplateResponse('files_sharing', 'Settings/personal'); } |