From 946512bac966826231d0e77bad0b032dba925a27 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 26 Nov 2016 20:18:46 -0500 Subject: [PATCH] search for owner: correctly. --- CHANGELOG.md | 2 ++ app/Http/Controllers/Admin/ServersController.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32217b313..65f8bc8b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. * Fixes a bug that would leave orphaned databases on the system if there was an error during creation. * Fixes an issue that could occur if a UUID contained `#e#` formatting within it when it comes to creating databases. * Fixed node status display to account for updated daemon security changes. +* Fixes default language being selected as German (defaults to English now). ### Changed * Using `node:` when filtering servers now properly filters the servers by node name, rather than looking for the node ID. +* Using `owner:` when filtering servers now properly filters by the owner's email rather than ID. * Added some quick help buttons to the admin index page for getting support or checking the documentation. * Panel now displays `Pterodactyl Panel` as the company name if one is not set. diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index 15dd1abd6..5ec7d9a2b 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -70,6 +70,8 @@ class ServersController extends Controller list($field, $term) = explode(':', $match); if ($field === 'node') { $field = 'nodes.name'; + } else if ($field === 'owner') { + $field = 'users.email'; } else if (!strpos($field, '.')) { $field = 'servers.' . $field; }