From c5e9e4e378519663fdf2edd2d699a17af6ce0b72 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Wed, 21 Sep 2022 15:32:20 +0200 Subject: [PATCH 1/2] Add order by on service account index --- app/Http/Controllers/ServiceAccountsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ServiceAccountsController.php b/app/Http/Controllers/ServiceAccountsController.php index 6bc65f1..c1f98f9 100644 --- a/app/Http/Controllers/ServiceAccountsController.php +++ b/app/Http/Controllers/ServiceAccountsController.php @@ -16,7 +16,7 @@ class ServiceAccountsController extends Controller */ public function index() { - $service_accounts = ServiceAccount::all(); + $service_accounts = ServiceAccount::all()->sortBy('name'); return view('service-accounts.index', compact('service_accounts')); } From 62c8d8a5a8a683ffed4591aa8ed8c99a6c9fbd6b Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Wed, 21 Sep 2022 15:34:53 +0200 Subject: [PATCH 2/2] tmp patch ldc network regression --- .../Controllers/API/LDCNetworksController.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/API/LDCNetworksController.php b/app/Http/Controllers/API/LDCNetworksController.php index fba1dd6..fd74363 100644 --- a/app/Http/Controllers/API/LDCNetworksController.php +++ b/app/Http/Controllers/API/LDCNetworksController.php @@ -15,7 +15,20 @@ class LDCNetworksController extends Controller */ public function index() { + // $networks = LDCNetwork::all(); + // return \response()->json((new LDCNetworkResource($networks))); + + $ips = []; + $networks = LDCNetwork::all(); - return \response()->json((new LDCNetworkResource($networks))); + foreach ($networks as $network) { + $infos = explode('.', $network->first_ip); + $min = $infos[3]; + $max = explode('.', $network->last_ip)[3]; + for ($i = $min; $i <= $max; $i++) { + $ips[] = "$infos[0].$infos[1].$infos[2].$i"; + } + } + return response($ips); } }