MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-13 20:03:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Initial implementation of improved sever model and logic

Browse Source
This commit is contained in:
Dane Everitt
2017-02-02 18:21:36 -05:00
parent fb589a7f4e
commit d4bcf0be59
31 changed files with 223 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/NodesController.php
View File

@@ -108,8 +108,8 @@ class NodesController extends Controller
return view('admin.nodes.view', [
'node' => $node,
'servers' => Models\Server::select('servers.*', 'users.email as a_ownerEmail', 'services.name as a_serviceName')
->join('users', 'users.id', '=', 'servers.owner')
->join('services', 'services.id', '=', 'servers.service')
->join('users', 'users.id', '=', 'servers.owner_id')
->join('services', 'services.id', '=', 'servers.service_id')
->where('node', $id)->paginate(10, ['*'], 'servers'),
'stats' => Models\Server::select(DB::raw('SUM(memory) as memory, SUM(disk) as disk'))->where('node', $node->id)->first(),
'locations' => Models\Location::all(),