Fix appstoreenabled check #29256
Merged
Fix appstoreenabled check #29256
Conversation
This file contains 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
nickvergessen
previously requested changes
Oct 15, 2021
70379ab to
50c690b
Compare
It still seems a bit strange that string values are all considered as true but at least checks are now consistent between the fetcher and the controller. |
50c690b to
8f7dfc7
Compare
…sController Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
8f7dfc7 to
facb50e
Compare
nickvergessen
approved these changes
Oct 18, 2021
This comment has been minimized.
This comment has been minimized.
Pytal
approved these changes
Oct 21, 2021
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
Fixed the tests |
@nickvergessen Thanks! |
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.
The
appstoreenabledcheck is inconsistent betweenlib/private/App/AppStore/Fetcher/Fetcher.phpandserver/apps/settings/lib/Controller/AppSettingsController.php
Line 134 in f7a4ff4
So if
appstoreenabledis a string, for example, the appstore is considered as enabled inFetcher.phpand the apps are fetched. The app settings page then receives a combined list of local apps and appstore ones.But as the check is different in
AppSettingsController.php, the appstore is considered as disabled there and the category list is not displayed in app settings.Check is now the same in both places.
This can be backported to stable20, stable21 and stable22.