Disable sharing calendars via link when sharing via link is disabled#34372
Closed
pboguslawski wants to merge 2 commits intonextcloud:masterfrom
Closed
Disable sharing calendars via link when sharing via link is disabled#34372pboguslawski wants to merge 2 commits intonextcloud:masterfrom
pboguslawski wants to merge 2 commits intonextcloud:masterfrom
Conversation
This mod disallows sharing calendars via link when `shareapi_allow_links` is disabled. Related: nextcloud/calendar#525 Related: nextcloud/calendar#4399 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
pboguslawski
added a commit
to ibpl/calendar
that referenced
this pull request
Oct 1, 2022
This mod hides sharing calendar via link in UI when `shareapi_allow_links` is disabled. Should be applied together with nextcloud/server#34372 Related: nextcloud/server#34372 Related: nextcloud#525 Related: nextcloud#4399 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
miaulalala
requested changes
Oct 1, 2022
Contributor
|
Thanks for your PR! A couple small change requests only :) |
tcitworld
requested changes
Oct 2, 2022
Fixes: 45eefc2 Related: nextcloud#34372 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
tcitworld
approved these changes
Oct 14, 2022
| \OC::$server->getConfig(), | ||
| \OC::$server->getURLGenerator() | ||
| )); | ||
| if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') { |
Check notice
Code scanning / Psalm
DeprecatedMethod
| )); | ||
| if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') { | ||
| $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin( | ||
| \OC::$server->getConfig(), |
Check notice
Code scanning / Psalm
DeprecatedMethod
| if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') { | ||
| $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin( | ||
| \OC::$server->getConfig(), | ||
| \OC::$server->getURLGenerator() |
Check notice
Code scanning / Psalm
DeprecatedMethod
ChristophWurst
approved these changes
Oct 14, 2022
Contributor
Author
|
Current solution (unregistering plugin) does not work correctly so please wait with merging until final solution is proposed. |
Member
|
@pboguslawski That's correct, thanks for checking! Sadly the AllowedSharingModes didn't fallback as I planned when the plugin was unregistered, so I made #34873 to extract exposing this information into it's own plugin. That should do it, please have a go and test. |
Contributor
Author
|
Replaced with #34873. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 mod disallows sharing calendars via link when
shareapi_allow_linksis disabled.Related: nextcloud/calendar#525
Related: nextcloud/calendar#4399
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski pawel.boguslawski@ib.pl