Startup not required, fix display executable bug

This commit is contained in:
Dane Everitt 2016-09-16 18:39:36 -04:00
parent 7e122ab6a8
commit bcd4b35890
2 changed files with 2 additions and 2 deletions

View File

@ -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',

View File

@ -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',
]);