diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 33738d52..7e83ef28 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -84,6 +84,7 @@ class ProductController extends Controller if (is_null($egg->id) || is_null($node->id)) return response()->json('node and egg id is required', '400'); return Product::query() + ->where('disabled', '=', false) ->whereHas('nodes', function (Builder $builder) use ($node) { $builder->where('id', '=', $node->id); }) diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php index 59109edd..b516c98a 100644 --- a/resources/views/servers/create.blade.php +++ b/resources/views/servers/create.blade.php @@ -103,7 +103,7 @@ x-model="selectedNest" @change="setEggs();"> + value="null">{{count($nests) > 0 ? __('Please select software ...') : __('---')}} @foreach ($nests as $nest) @endforeach @@ -229,10 +229,11 @@ + @@ -428,7 +433,7 @@ getNodeInputText() { if (this.fetchedLocations) { if (this.locations.length > 0) { - return '{{__('Please select a node...')}}'; + return '{{__('Please select a node ...')}}'; } return '{{__('No nodes found matching current configuration')}}' } @@ -438,7 +443,7 @@ getProductInputText() { if (this.fetchedProducts) { if (this.products.length > 0) { - return '{{__('Please select a resource...')}}'; + return '{{__('Please select a resource ...')}}'; } return '{{__('No resources found matching current configuration')}}' } @@ -447,7 +452,7 @@ getEggInputText() { if (this.selectedNest) { - return '{{__('Please select a configuration...')}}'; + return '{{__('Please select a configuration ...')}}'; } return '{{__('---')}}'; },