From e913b4a584ad71dee95222e1d36934c57702069b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Tue, 25 Jun 2024 15:43:39 +0200 Subject: [PATCH] Fix FLEXIAPI-195 Fix LiblinphoneTesterAccoutSeeder to fit with the latest Account related changes --- CHANGELOG.md | 1 + flexiapi/database/seeds/LiblinphoneTesterAccoutSeeder.php | 8 +++++--- .../resources/views/admin/account/create_edit.blade.php | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c98e68..3d68409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ v1.5 --- +- Fix FLEXIAPI-195 Fix LiblinphoneTesterAccoutSeeder to fit with the latest Account related changes - Fix FLEXIAPI-193 Typo - Fix FLEXIAPI-192 Clear and upgrade properly the account dictionary entries if the entries are already existing - Fix FLEXIAPI-191 Add quotes for the pn-prid parameter in FlexisipPusherConnector diff --git a/flexiapi/database/seeds/LiblinphoneTesterAccoutSeeder.php b/flexiapi/database/seeds/LiblinphoneTesterAccoutSeeder.php index 6f9f442..50ff9ec 100644 --- a/flexiapi/database/seeds/LiblinphoneTesterAccoutSeeder.php +++ b/flexiapi/database/seeds/LiblinphoneTesterAccoutSeeder.php @@ -37,6 +37,7 @@ class LiblinphoneTesterAccoutSeeder extends Seeder $element->id, $element->username, $element->domain, + $element->phone ?? null, $element->activated ?? true, $element->confirmation_key ?? null ) @@ -64,6 +65,7 @@ class LiblinphoneTesterAccoutSeeder extends Seeder str_replace('%id%', $element->idStart + $i, $element->id), str_replace('%usernamePostfix%', $element->usernameStart + $i, $element->username), $element->domain, + $element->phone ?? null, $element->activated ?? true, $element->confirmation_key ?? null ) @@ -88,14 +90,14 @@ class LiblinphoneTesterAccoutSeeder extends Seeder } private function generateAccountArray( - int $id, string $username, - string $domain, bool $activated = true, - string $confirmationKey = null + int $id, string $username, string $domain, string $phone = null, + bool $activated = true, string $confirmationKey = null ): array { return [ 'id' => $id, 'username' => $username, 'domain' => $domain, + 'phone' => $phone, 'email' => rawurlencode($username) . '@' . $domain, 'activated' => $activated, 'ip_address' => '', diff --git a/flexiapi/resources/views/admin/account/create_edit.blade.php b/flexiapi/resources/views/admin/account/create_edit.blade.php index 0c3056e..ec8f030 100644 --- a/flexiapi/resources/views/admin/account/create_edit.blade.php +++ b/flexiapi/resources/views/admin/account/create_edit.blade.php @@ -21,9 +21,11 @@ -

Updated on {{ $account->updated_at->format('d/m/Y') }} - @include('admin.account.parts.tabs') - @else + @if ($account->updated_at) +

Updated on {{ $account->updated_at->format('d/m/Y') }} + @endif + @include('admin.account.parts.tabs') + @else

people Create an account

Cancel