Skip to content

Commit 617ff0f

Browse files
committed
Merge branch 'hotfix/1.8.3'
2 parents 19562af + efb6064 commit 617ff0f

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
## [1.8.1] - 2025-02-06
10+
## [1.8.3] - 2025-02-06
11+
12+
- Fix missing "depends" in docker compose
13+
- Fix easyadmin deprecations
14+
15+
## [1.8.2] - 2025-02-06
1116

1217
- Add 'application/ld+json' as allowed format
1318

docker-compose.server.override.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ services:
2828
volumes:
2929
- .:/app
3030
- ../../shared/.env.local:/app/.env.local
31+
depends_on:
32+
- rabbit
3133

3234
phpfpm:
3335
volumes:
3436
- ../../shared/.env.local:/app/.env.local
37+
depends_on:
38+
- rabbit

src/Controller/Admin/ServerCrudController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@ public function configureActions(Actions $actions): Actions
6969
#[\Override]
7070
public function configureFields(string $pageName): iterable
7171
{
72-
yield FormField::addPanel('Provider Details');
72+
yield FormField::addFieldset('Provider Details');
7373
yield TextField::new('name')->setColumns(8)->setTemplatePath('EasyAdminBundle/Fields/ssh_link.html.twig');
7474
yield TextField::new('hostingProviderName')->setColumns(4)->hideOnIndex();
7575
yield AssociationField::new('installations');
7676
yield ChoiceField::new('type')->setChoices(ServerTypeType::CHOICES)->renderExpanded()->setColumns(8)->setTemplatePath('EasyAdminBundle/Fields/server_type.html.twig');
7777
yield ChoiceField::new('hostingProvider')->setChoices(HostingProviderType::CHOICES)->setColumns(4)->setTemplatePath('EasyAdminBundle/Fields/hosting_provider.html.twig')->setLabel('Host. Pro.');
7878
yield TextField::new('apiKey')->setColumns(8)->setFormTypeOptions(['disabled' => 'true'])->onlyOnDetail()->setTemplatePath('EasyAdminBundle/Fields/code.html.twig');
79-
yield FormField::addPanel('Network');
79+
yield FormField::addFieldset('Network');
8080
yield TextField::new('internalIp')->setColumns(6)->setTemplatePath('EasyAdminBundle/Fields/code.html.twig')->hideOnIndex();
8181
yield TextField::new('externalIp')->setColumns(6)->setTemplatePath('EasyAdminBundle/Fields/code.html.twig')->hideOnIndex();
82-
yield FormField::addPanel('Options');
82+
yield FormField::addFieldset('Options');
8383
yield BooleanField::new('aarhusSsl')->setColumns(3)->hideOnIndex();
8484
yield BooleanField::new('letsEncryptSsl')->setColumns(3)->hideOnIndex();
8585
yield BooleanField::new('veeam')->setColumns(2)->hideOnIndex();
8686
yield BooleanField::new('azureBackup')->setColumns(2)->hideOnIndex();
8787
yield BooleanField::new('monitoring')->setColumns(2)->hideOnIndex();
88-
yield FormField::addPanel('System Details');
88+
yield FormField::addFieldset('System Details');
8989
yield ChoiceField::new('databaseVersion')->setChoices(DatabaseVersionType::CHOICES)->renderExpanded()->setColumns(6)->setTemplatePath('EasyAdminBundle/Fields/db_version.html.twig')->setLabel('DB ver.');
9090
yield ChoiceField::new('system')->setChoices(SystemType::CHOICES)->renderExpanded()->setColumns(6)->setTemplatePath('EasyAdminBundle/Fields/version.html.twig');
91-
yield FormField::addPanel('Miscellaneous');
91+
yield FormField::addFieldset('Miscellaneous');
9292
yield TextField::new('serviceDeskTicket')->setColumns(12)->hideOnIndex();
9393
yield TextareaField::new('note')->hideOnIndex()->setColumns(6);
9494
yield TextareaField::new('usedFor')->hideOnIndex()->setColumns(6);

0 commit comments

Comments
 (0)