From f20056ec73f298529db3c519de18b0c496662ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Mon, 16 Jun 2025 17:19:39 +0200
Subject: [PATCH] Fix FLEXIAPI-329 Use correct routes for accounts devices

---
 CHANGELOG.md                                                   | 2 ++
 .../app/Http/Controllers/Admin/AccountDeviceController.php     | 2 +-
 flexiapi/resources/views/admin/account/device/delete.blade.php | 3 ---
 flexiapi/resources/views/admin/account/show.blade.php          | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc037b2..4918cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,8 @@ v2.0
 - Fix FLEXIAPI-322 Api Keys documentation
 - Fix FLEXIAPI-328 Set realm on Space creation, limit the update if some accounts are present
 - Fix FLEXIAPI-325 Add endpoints to send the password reset and provisioning emails
+- Fix FLEXIAPI-332 Check if the first line was untouched and that the number of columns is exact on each lines
+- Fix FLEXIAPI-329 Use correct routes for accounts devices
 
 v1.6
 ----
diff --git a/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php b/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php
index 3e4a2a3..3d1dfa0 100644
--- a/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php
+++ b/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php
@@ -62,6 +62,6 @@ class AccountDeviceController extends Controller
 
         $connector->deleteDevice($account->identifier, $request->get('uuid'));
 
-        return redirect()->route('admin.account.device.index', $account);
+        return redirect()->route('admin.account.show', $account);
     }
 }
diff --git a/flexiapi/resources/views/admin/account/device/delete.blade.php b/flexiapi/resources/views/admin/account/device/delete.blade.php
index b8514b8..2dce50b 100644
--- a/flexiapi/resources/views/admin/account/device/delete.blade.php
+++ b/flexiapi/resources/views/admin/account/device/delete.blade.php
@@ -3,9 +3,6 @@
 @section('breadcrumb')
     @include('admin.account.parts.breadcrumb_accounts_index')
     @include('admin.account.parts.breadcrumb_accounts_show', ['account' => $account])
-    <li class="breadcrumb-item">
-        <a href="{{ route('admin.account.device.index', $account) }}">Devices</a>
-    </li>
     <li class="breadcrumb-item active" aria-current="page">{{ __('Delete') }}</li>
 @endsection
 
diff --git a/flexiapi/resources/views/admin/account/show.blade.php b/flexiapi/resources/views/admin/account/show.blade.php
index c2466a3..c1c4851 100644
--- a/flexiapi/resources/views/admin/account/show.blade.php
+++ b/flexiapi/resources/views/admin/account/show.blade.php
@@ -147,7 +147,7 @@
                             <tr>
                                 <td class="line">{{ $device->user_agent }}</td>
                                 <td class="actions">
-                                    <a type="button" class="btn small tertiary" href="{{ route('admin.account.device.delete', [$device->uuid]) }}">
+                                    <a type="button" class="btn small tertiary" href="{{ route('admin.account.device.delete', [$account->id, $device->uuid]) }}">
                                         <i class="ph">trash</i>
                                     </a>
                                 </td>