Make the share accept process optional #18940
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
/backport to stable18 |
rullzer
requested changes
Jan 16, 2020
Member
rullzer
left a comment
rullzer
left a comment
There was a problem hiding this comment.
Also I think you need to update the classmap
|
|
||
| private function handleAutoAccept(IShare $share, string $userId) { | ||
| if ($this->config->getUserValue($userId, 'files_sharing','default_accept','no') === 'yes') { | ||
| $defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes'; |
Member
There was a problem hiding this comment.
Shouldn't we have another if here. That if share accept is false. We just accept it directly?
Member
Author
There was a problem hiding this comment.
No this is just the default value that might be overwritten later by the user value. If no user value is set it will be used.
rullzer
approved these changes
Jan 16, 2020
skjnldsv
approved these changes
Jan 16, 2020
Signed-off-by: Julius Härtl <jus@bitgrid.net>
…are acceptance process Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
rullzer
force-pushed
the
force-share-accept
branch
from
3abdadb to
176aeab
Compare
|
The backport to stable18 failed. Please do this backport manually. |
juliusknorr
added
the
pending documentation
juliusknorr
removed
the
pending documentation
Member
Author
|
Autodocumented through the config.php sample |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes accepting shares automatically the default. There are two config.php settings:
The sharing settings will be hidden if accepting is enforced.