From 7dd00d6d8863549f2816768353cb5bbbfb84fddb Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 16 Sep 2016 18:44:12 -0400 Subject: [PATCH] Fix startup executable display bug --- app/Http/Controllers/Server/ServerController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Server/ServerController.php b/app/Http/Controllers/Server/ServerController.php index fb8fbaa5a..4995784bc 100644 --- a/app/Http/Controllers/Server/ServerController.php +++ b/app/Http/Controllers/Server/ServerController.php @@ -200,9 +200,9 @@ class ServerController extends Controller ->get(); $service = Models\Service::select( - DB::raw('COALESCE(service_options.executable, services.executable) as executable'), - DB::raw('COALESCE(service_options.startup, services.startup) as startup') + DB::raw('IFNULL(service_options.executable, services.executable) as executable') )->leftJoin('service_options', 'service_options.parent_service', '=', 'services.id') + ->where('service_options.id', $server->option) ->where('services.id', $server->service) ->first();