From fae5acf99f8a067df9144ced5ca008047ce2e58a Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 20 May 2018 17:00:50 -0700 Subject: [PATCH] Fix bug when loading server owner dropdown closes #1137 --- CHANGELOG.md | 1 + app/Contracts/Repository/UserRepositoryInterface.php | 4 ++-- app/Repositories/Eloquent/UserRepository.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd831ed30..fe758d3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. ### Fixed * 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 bug when attempting to load the dropdown menu for server owner in some cases. ### Added * Added a new client API endpoint for gathering the utilization stats for servers including disk, cpu, and memory. `GET /api/client/servers//utilization` diff --git a/app/Contracts/Repository/UserRepositoryInterface.php b/app/Contracts/Repository/UserRepositoryInterface.php index b5003e0b2..41649f48b 100644 --- a/app/Contracts/Repository/UserRepositoryInterface.php +++ b/app/Contracts/Repository/UserRepositoryInterface.php @@ -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. * - * @param string $query + * @param string|null $query * @return \Illuminate\Support\Collection */ - public function filterUsersByQuery(string $query): Collection; + public function filterUsersByQuery(?string $query): Collection; } diff --git a/app/Repositories/Eloquent/UserRepository.php b/app/Repositories/Eloquent/UserRepository.php index 008916de2..b69df198c 100644 --- a/app/Repositories/Eloquent/UserRepository.php +++ b/app/Repositories/Eloquent/UserRepository.php @@ -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. * - * @param string $query + * @param string|null $query * @return \Illuminate\Support\Collection */ - public function filterUsersByQuery(string $query): Collection + public function filterUsersByQuery(?string $query): Collection { $this->setColumns([ 'id', 'email', 'username', 'name_first', 'name_last',