Skip to content

Commit

Permalink
closes #69
Browse files Browse the repository at this point in the history
  • Loading branch information
DaneEveritt committed Aug 16, 2016
1 parent 7c80588 commit 445b2f2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/Http/Controllers/Server/ServerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ public function getSettings(Request $request, $uuid)
'service_variables.*',
DB::raw('COALESCE(server_variables.variable_value, service_variables.default_value) as a_serverValue')
)->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();

$service = Models\Service::select(
Expand Down

0 comments on commit 445b2f2

Please sign in to comment.