From 75de060a5587a71dc4a91792eb29ccb7799796a2 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 27 Nov 2016 14:57:23 -0500 Subject: [PATCH] Fix pack selector --- app/Http/Controllers/Admin/ServersController.php | 2 +- app/Repositories/ServerRepository.php | 2 +- resources/views/admin/servers/new.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index c15a4a658..8b19fafea 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -276,7 +276,7 @@ class ServersController extends Controller ->first(); return response()->json([ - 'packs' => Models\ServicePack::select('uuid', 'name', 'version')->where('option', $request->input('option'))->where('selectable', true)->get(), + 'packs' => Models\ServicePack::select('id', 'name', 'version')->where('option', $request->input('option'))->where('selectable', true)->get(), 'variables' => Models\ServiceVariables::where('option_id', $request->input('option'))->get(), 'exec' => $option->executable, 'startup' => $option->startup diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php index 5d25f0e68..bb8f52c56 100644 --- a/app/Repositories/ServerRepository.php +++ b/app/Repositories/ServerRepository.php @@ -86,7 +86,7 @@ class ServerRepository 'disk' => 'required|numeric|min:0', 'service' => 'bail|required|numeric|min:1|exists:services,id', 'option' => 'bail|required|numeric|min:1|exists:service_options,id', - 'pack' => 'bail|required|numeric|min:0' + 'pack' => 'bail|required|numeric|min:0', 'startup' => 'string', 'custom_image_name' => 'required_if:use_custom_image,on', 'auto_deploy' => 'sometimes|boolean' diff --git a/resources/views/admin/servers/new.blade.php b/resources/views/admin/servers/new.blade.php index 5d831ce6f..7fe9b76d9 100644 --- a/resources/views/admin/servers/new.blade.php +++ b/resources/views/admin/servers/new.blade.php @@ -449,7 +449,7 @@ $(document).ready(function () { $('input[name="startup"]').val(data.startup); $.each(data.packs, function (i, item) { - $('#getPack').append(''); + $('#getPack').append(''); }); $('#getPack').append('').parent().parent().removeClass('hidden');