From fd5b74c87383a9f41075afbce0c4b12140c13b1e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 3 Mar 2017 17:53:35 -0500
Subject: [PATCH] Use usernames for @schrej

---
 app/Http/Controllers/Admin/NodesController.php                | 2 +-
 .../themes/pterodactyl/admin/nodes/view/servers.blade.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/NodesController.php b/app/Http/Controllers/Admin/NodesController.php
index 8ee9e2df8..ee4a58066 100644
--- a/app/Http/Controllers/Admin/NodesController.php
+++ b/app/Http/Controllers/Admin/NodesController.php
@@ -211,7 +211,7 @@ class NodesController extends Controller
      */
     public function viewServers(Request $request, $id)
     {
-        $node = Models\Node::with('servers.user', 'servers.service', 'servers.allocations')->findOrFail($id);
+        $node = Models\Node::with('servers.user', 'servers.service', 'servers.option')->findOrFail($id);
         Javascript::put([
             'node' => collect($node->makeVisible('daemonSecret'))->only(['scheme', 'fqdn', 'daemonListen', 'daemonSecret']),
         ]);
diff --git a/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php b/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
index d7ebcbabe..519b5fbbe 100644
--- a/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
+++ b/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
@@ -70,8 +70,8 @@
                         <tr data-server="{{ $server->uuid }}">
                             <td><code>{{ $server->uuidShort }}</code></td>
                             <td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></td>
-                            <td><a href="{{ route('admin.users.view', $server->owner_id) }}"><code>{{ $server->user->email }}</code></a></td>
-                            <td>{{ $server->service->name }}</td>
+                            <td><a href="{{ route('admin.users.view', $server->owner_id) }}">{{ $server->user->username }}</a></td>
+                            <td>{{ $server->service->name }} ({{ $server->option->name }})</td>
                             <td class="text-center"><span data-action="memory">NaN</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>
                             <td class="text-center">{{ $server->disk }} MB</td>
                             <td class="text-center"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">NaN</span> %</td>