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

Use usernames for @schrej

Browse source
This commit is contained in:
Dane Everitt 2017-03-03 17:53:35 -05:00
parent 2854a55aa2
commit fd5b74c873
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/NodesController.php
View file

@ -211,7 +211,7 @@ class NodesController extends Controller
*/ */
public function viewServers(Request $request, $id) 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([ Javascript::put([
'node' => collect($node->makeVisible('daemonSecret'))->only(['scheme', 'fqdn', 'daemonListen', 'daemonSecret']), 'node' => collect($node->makeVisible('daemonSecret'))->only(['scheme', 'fqdn', 'daemonListen', 'daemonSecret']),
]); ]);

4
resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
View file

@ -70,8 +70,8 @@
<tr data-server="{{ $server->uuid }}"> <tr data-server="{{ $server->uuid }}">
<td><code>{{ $server->uuidShort }}</code></td> <td><code>{{ $server->uuidShort }}</code></td>
<td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></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><a href="{{ route('admin.users.view', $server->owner_id) }}">{{ $server->user->username }}</a></td>
<td>{{ $server->service->name }}</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"><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">{{ $server->disk }} MB</td>
<td class="text-center"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">NaN</span> %</td> <td class="text-center"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">NaN</span> %</td>