From bcd4b3589042829008cc47bba07f0a71b95f57d8 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 16 Sep 2016 18:39:36 -0400 Subject: [PATCH] Startup not required, fix display executable bug --- app/Http/Controllers/Admin/ServersController.php | 2 +- app/Repositories/ServerRepository.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index 5e09093b4..442534df6 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -82,7 +82,7 @@ class ServersController extends Controller 'users.email as a_ownerEmail', 'locations.long as a_locationName', 'services.name as a_serviceName', - 'services.executable as a_serviceExecutable', + DB::raw('IFNULL(service_options.executable, services.executable) as a_serviceExecutable'), 'service_options.name as a_servceOptionName', 'allocations.ip', 'allocations.port', diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php index 8a4e188ae..f29abec6d 100644 --- a/app/Repositories/ServerRepository.php +++ b/app/Repositories/ServerRepository.php @@ -101,7 +101,7 @@ class ServerRepository 'port' => 'required_without:allocation|numeric|min:1|max:65535', 'service' => 'required|numeric|min:1|exists:services,id', 'option' => 'required|numeric|min:1|exists:service_options,id', - 'startup' => 'required', + 'startup' => 'string', 'custom_image_name' => 'required_if:use_custom_image,on', ]);