sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #69

This commit is contained in:
Dane Everitt 2016-08-16 19:06:03 -04:00
parent 7c80588fd3
commit 445b2f20eb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Server/ServerController.php
View File

@ -204,7 +204,8 @@ class ServerController extends Controller
'service_variables.*', 'service_variables.*',
DB::raw('COALESCE(server_variables.variable_value, service_variables.default_value) as a_serverValue') DB::raw('COALESCE(server_variables.variable_value, service_variables.default_value) as a_serverValue')
)->leftJoin('server_variables', 'server_variables.variable_id', '=', 'service_variables.id') )->leftJoin('server_variables', 'server_variables.variable_id', '=', 'service_variables.id')
->where('option_id', $server->option) ->where('service_variables.option_id', $server->option)
->where('server_variables.server_id', $server->id)
->get(); ->get();
$service = Models\Service::select( $service = Models\Service::select(