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

Fix bug when loading server owner dropdown

Browse source 
closes #1137
This commit is contained in:
Dane Everitt 2018-05-20 17:00:50 -07:00
parent 3bb9c521c0
commit fae5acf99f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
### Fixed ### Fixed
* Fixes an issue with the sidebar logo not working correctly in some browsers due to the CSS being assigned. * Fixes an issue with the sidebar logo not working correctly in some browsers due to the CSS being assigned.
* Fixes a bunch of typos through the code base. * Fixes a bunch of typos through the code base.
* Fixes a bug when attempting to load the dropdown menu for server owner in some cases.
### Added ### Added
* Added a new client API endpoint for gathering the utilization stats for servers including disk, cpu, and memory. `GET /api/client/servers/<id>/utilization` * Added a new client API endpoint for gathering the utilization stats for servers including disk, cpu, and memory. `GET /api/client/servers/<id>/utilization`

4
app/Contracts/Repository/UserRepositoryInterface.php
View file

@ -18,8 +18,8 @@ interface UserRepositoryInterface extends RepositoryInterface, SearchableInterfa
/** /**
* Return all matching models for a user in a format that can be used for dropdowns. * Return all matching models for a user in a format that can be used for dropdowns.
* *
* @param string $query * @param string|null $query
* @return \Illuminate\Support\Collection * @return \Illuminate\Support\Collection
*/ */
public function filterUsersByQuery(string $query): Collection; public function filterUsersByQuery(?string $query): Collection;
} }

4
app/Repositories/Eloquent/UserRepository.php
View file

@ -37,10 +37,10 @@ class UserRepository extends EloquentRepository implements UserRepositoryInterfa
/** /**
* Return all matching models for a user in a format that can be used for dropdowns. * Return all matching models for a user in a format that can be used for dropdowns.
* *
* @param string $query * @param string|null $query
* @return \Illuminate\Support\Collection * @return \Illuminate\Support\Collection
*/ */
public function filterUsersByQuery(string $query): Collection public function filterUsersByQuery(?string $query): Collection
{ {
$this->setColumns([ $this->setColumns([
'id', 'email', 'username', 'name_first', 'name_last', 'id', 'email', 'username', 'name_first', 'name_last',