Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/client-api

Browse source
This commit is contained in:
Dane Everitt 2018-02-27 21:04:18 -06:00
commit 9a32b9fd03
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.7.4 (Derelict Dermodactylus)
### Fixed
* Fixes a bug when reinstalling a server that would not mark the server as installing, resulting in some UI issues.
* Handle 404 errors from missing models in the application API bindings correctly.
## v0.7.3 (Derelict Dermodactylus)
### Fixed

4
app/Http/Middleware/Api/ApiSubstituteBindings.php
View file

@ -45,7 +45,9 @@ class ApiSubstituteBindings extends SubstituteBindings
$route = $request->route();
foreach (self::$mappings as $key => $model) {
$this->router->model($key, $model);
$this->router->model($key, $model, function () use ($request) {
$request->attributes->set('is_missing_model', true);
});
}
$this->router->substituteBindings($route);