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

Show server status in sidebar properly on subuser views

Browse source
This commit is contained in:
Dane Everitt 2017-01-21 13:49:14 -05:00
parent 8e9069cced
commit db7b741b28
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/Http/Controllers/Server/SubuserController.php
View file

@ -28,6 +28,7 @@ use DB;
use Log;
use Auth;
use Alert;
use Javascript;
use Pterodactyl\Models;
use Illuminate\Http\Request;
use Pterodactyl\Exceptions\DisplayException;
@ -51,10 +52,16 @@ class SubuserController extends Controller
{
$server = Models\Server::getByUUID($uuid);
$this->authorize('list-subusers', $server);
$node = Models\Node::find($server->node);
Javascript::put([
'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
]);
return view('server.users.index', [
'server' => $server,
'node' => Models\Node::find($server->node),
'node' => $node,
'subusers' => Models\Subuser::select('subusers.*', 'users.email', 'users.username')
->join('users', 'users.id', '=', 'subusers.user_id')
->where('server_id', $server->id)
@ -66,6 +73,12 @@ class SubuserController extends Controller
{
$server = Models\Server::getByUUID($uuid);
$this->authorize('view-subuser', $server);
$node = Models\Node::find($server->node);
Javascript::put([
'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
]);
$subuser = Models\Subuser::select('subusers.*', 'users.email as a_userEmail')
->join('users', 'users.id', '=', 'subusers.user_id')
@ -87,7 +100,7 @@ class SubuserController extends Controller
return view('server.users.view', [
'server' => $server,
'node' => Models\Node::find($server->node),
'node' => $node,
'subuser' => $subuser,
'permissions' => $permissions,
]);
@ -137,10 +150,16 @@ class SubuserController extends Controller
{
$server = Models\Server::getByUUID($uuid);
$this->authorize('create-subuser', $server);
$node = Models\Node::find($server->node);
Javascript::put([
'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
]);
return view('server.users.new', [
'server' => $server,
'node' => Models\Node::find($server->node),
'node' => $node,
]);
}

5
resources/themes/pterodactyl/server/users/index.blade.php
View file

@ -84,3 +84,8 @@
</div>
</div>
@endsection
@section('footer-scripts')
@parent
{!! Theme::js('js/frontend/server.socket.js') !!}
@endsection

1
resources/themes/pterodactyl/server/users/new.blade.php
View file

@ -400,6 +400,7 @@
@section('footer-scripts')
@parent
{!! Theme::js('js/frontend/server.socket.js') !!}
<script type="text/javascript">
$(document).ready(function () {
$('#selectAllCheckboxes').on('click', function () {

1
resources/themes/pterodactyl/server/users/view.blade.php
View file

@ -404,6 +404,7 @@
@section('footer-scripts')
@parent
{!! Theme::js('js/frontend/server.socket.js') !!}
<script type="text/javascript">
$(document).ready(function () {
$('#selectAllCheckboxes').on('click', function () {