Make sure urlparams are correctly injected in global routes#14626
Merged
MorrisJobke merged 2 commits intomasterfrom Mar 12, 2019
Merged
Conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
commented
Mar 11, 2019
| ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'], | ||
|
|
||
| // Legacy routes that need to be globally available while they are handled by an app | ||
| ['name' => 'viewcontroller#showFile', 'url' => '/f/{fileid}', 'verb' => 'GET', 'app' => 'files'], |
Member
Author
There was a problem hiding this comment.
I think it should also be possible, to move those to the respective apps, when at the same time we allow defining a root' => '/cloud' similar to OCS urls.
Just not sure how this breaks existing route generations (because all lowercase instead of CamelCase controller names, which is why the hacks in lib/private/AppFramework/Routing/RouteConfig.php were necessary)
nickvergessen
commented
Mar 11, 2019
| if (strpos($controllerName, '\\Controller\\') !== false) { | ||
| // This is from a global registered app route that is not enabled. | ||
| [/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3); | ||
| throw new HintException('App ' . strtolower($app) . ' is not enabled'); |
Member
Author
There was a problem hiding this comment.
this is inaccurate for cloud_federation_api as it shows cloudfederationapi instead.
Worth adding another hack? however it's pretty useless anyway.
|
🤖 beep boop beep 🤖 Here are the logs for the failed build: Status of 16911: failureTESTS=integration-federation_features
Show full logTESTS=acceptance, TESTS-ACCEPTANCE=app-files
Show full log |
MorrisJobke
approved these changes
Mar 12, 2019
Member
MorrisJobke
left a comment
MorrisJobke
left a comment
There was a problem hiding this comment.
Tested and works 👍 Also the code looks good 👍
ChristophWurst
approved these changes
Mar 12, 2019
Member
ChristophWurst
left a comment
ChristophWurst
left a comment
There was a problem hiding this comment.
Makes sense, code looks good!
ChristophWurst
deleted the
bugfix/14621/make-sure-urlparams-are-correctly-injected-in-global-routes
branch
|
faily-bot was still complaining about failures yet this PR got merged?! |
Member
Yes because there are some failures on master and we are currently looking into how to fix them. They slipped through. |
This was referenced Mar 14, 2019
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
4 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.
Fix #14621