Skip to content

Commit bcd4b35

Browse files
committed
Startup not required, fix display executable bug
1 parent 7e122ab commit bcd4b35

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Http/Controllers/Admin/ServersController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function getView(Request $request, $id)
8282
'users.email as a_ownerEmail',
8383
'locations.long as a_locationName',
8484
'services.name as a_serviceName',
85-
'services.executable as a_serviceExecutable',
85+
DB::raw('IFNULL(service_options.executable, services.executable) as a_serviceExecutable'),
8686
'service_options.name as a_servceOptionName',
8787
'allocations.ip',
8888
'allocations.port',

app/Repositories/ServerRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function create(array $data)
101101
'port' => 'required_without:allocation|numeric|min:1|max:65535',
102102
'service' => 'required|numeric|min:1|exists:services,id',
103103
'option' => 'required|numeric|min:1|exists:service_options,id',
104-
'startup' => 'required',
104+
'startup' => 'string',
105105
'custom_image_name' => 'required_if:use_custom_image,on',
106106
]);
107107

0 commit comments

Comments
 (0)