MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-16 21:33:44 +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

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

@@ -137,7 +137,7 @@ class ServiceController extends Controller
'option' => $opt,
'variables' => Models\ServiceVariables::where('option_id', $option)->get(),
'servers' => Models\Server::select('servers.*', 'users.email as a_ownerEmail')
->join('users', 'users.id', '=', 'servers.owner')
->join('users', 'users.id', '=', 'servers.owner_id')
->where('option', $option)
->paginate(10),
]);