StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Singularize model names.

Browse source
This commit is contained in:
Dane Everitt 2017-02-12 16:02:23 -05:00
parent 7c916ad38f
commit 8ba479e51f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
25 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Server/ServerController.php
View file

@ -214,7 +214,7 @@ class ServerController extends Controller
}]);
$this->authorize('view-startup', $server);
$variables = Models\ServiceVariables::select(
$variables = Models\ServiceVariable::select(
'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')