Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-23 01:22:30 +01:00
Code Issues Releases Wiki Activity

search for owner:<email> correctly.

Browse Source
This commit is contained in:
Dane Everitt 2016-11-26 20:18:46 -05:00
parent b7a566a937
commit 946512bac9
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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 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. * 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. * Fixed node status display to account for updated daemon security changes.
* Fixes default language being selected as German (defaults to English now).
### Changed ### Changed
* Using `node:<name>` when filtering servers now properly filters the servers by node name, rather than looking for the node ID. * Using `node:<name>` when filtering servers now properly filters the servers by node name, rather than looking for the node ID.
* Using `owner:<email>` 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. * 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. * Panel now displays `Pterodactyl Panel` as the company name if one is not set.

2
app/Http/Controllers/Admin/ServersController.php
View File

@ -70,6 +70,8 @@ class ServersController extends Controller
list($field, $term) = explode(':', $match); list($field, $term) = explode(':', $match);
if ($field === 'node') { if ($field === 'node') {
$field = 'nodes.name'; $field = 'nodes.name';
} else if ($field === 'owner') {
$field = 'users.email';
} else if (!strpos($field, '.')) { } else if (!strpos($field, '.')) {
$field = 'servers.' . $field; $field = 'servers.' . $field;
} }