From 41e754b424df02b9188c4365d067087cbff39213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Mon, 7 Jul 2025 15:36:18 +0200 Subject: [PATCH] Fix FLEXIAPI-350 Fix wrongly assigned variables in some views --- CHANGELOG.md | 1 + flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php | 2 +- .../app/Http/Controllers/Admin/AccountDictionaryController.php | 2 +- flexiapi/resources/views/mails/recover_by_code.blade.php | 2 +- .../views/mails/recover_by_code_custom.blade.php.example | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 208b6a1..eccbe64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ v2.0 - Fix FLEXIAPI-341 Allow realm to be empty when creating a Space - Fix FLEXIAPI-342 Enforce password change when the External Account domain is changed - Fix FLEXIAPI-346 Complete the supporting text for the provisioning ini field +- Fix FLEXIAPI-350 Fix wrongly assigned variables in some views v1.6 ---- diff --git a/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php b/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php index 3d1dfa0..df76ecf 100644 --- a/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php +++ b/flexiapi/app/Http/Controllers/Admin/AccountDeviceController.php @@ -49,7 +49,7 @@ class AccountDeviceController extends Controller 'admin.account.device.delete', [ 'account' => $account, - 'device' => $connector->getDevices($account->identifier) + 'device' => $connector->getDevices($account->identifier) ->where('uuid', $uuid)->first() ] ); diff --git a/flexiapi/app/Http/Controllers/Admin/AccountDictionaryController.php b/flexiapi/app/Http/Controllers/Admin/AccountDictionaryController.php index 5c6112f..4118fcf 100644 --- a/flexiapi/app/Http/Controllers/Admin/AccountDictionaryController.php +++ b/flexiapi/app/Http/Controllers/Admin/AccountDictionaryController.php @@ -92,7 +92,7 @@ class AccountDictionaryController extends Controller 'admin.account.dictionary.delete', [ 'account' => $account, - 'entry' => $account->dictionaryEntries()->where('key', $key)->firstOrFail() + 'entry' => $account->dictionaryEntries()->where('key', $key)->firstOrFail() ] ); } diff --git a/flexiapi/resources/views/mails/recover_by_code.blade.php b/flexiapi/resources/views/mails/recover_by_code.blade.php index 0cb0774..49b0c74 100644 --- a/flexiapi/resources/views/mails/recover_by_code.blade.php +++ b/flexiapi/resources/views/mails/recover_by_code.blade.php @@ -3,7 +3,7 @@ @section('content') # {{ __('Account Recovery Request') }} -{{ __('We received a request to recover your account on :space', ['Space' => $space->name]) }} +{{ __('We received a request to recover your account on :space', ['space' => $space->name]) }} {{ __('To proceed, please enter the verification code below:') }} diff --git a/flexiapi/resources/views/mails/recover_by_code_custom.blade.php.example b/flexiapi/resources/views/mails/recover_by_code_custom.blade.php.example index 0cb0774..49b0c74 100644 --- a/flexiapi/resources/views/mails/recover_by_code_custom.blade.php.example +++ b/flexiapi/resources/views/mails/recover_by_code_custom.blade.php.example @@ -3,7 +3,7 @@ @section('content') # {{ __('Account Recovery Request') }} -{{ __('We received a request to recover your account on :space', ['Space' => $space->name]) }} +{{ __('We received a request to recover your account on :space', ['space' => $space->name]) }} {{ __('To proceed, please enter the verification code below:') }}