Skip to content

Commit 2f02c76

Browse files
martinydemartinyde
authored
Merge pull request #392 from itk-dev/hotfix/missing-parameter
Updated look admin pages
2 parents 2757462 + c212712 commit 2f02c76

16 files changed

Lines changed: 66 additions & 29 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
- [PR-392](https://github.com/itk-dev/os2loop/pull/392)
12+
- Update admin forms to match d11
13+
- Update OIDC container
14+
1115
- [PR-391](https://github.com/itk-dev/os2loop/pull/391)
1216
Mail development setup
1317

‎docker-compose.oidc.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
services:
22
idp-employee:
33
image: ghcr.io/geigerzaehler/oidc-provider-mock:latest
4+
# Let this container be accessible both internally and externally on the same domain.
5+
container_name: idp-employee.${COMPOSE_DOMAIN}
46
networks:
57
- app
68
- frontend
79
labels:
810
- "traefik.enable=true"
911
- "traefik.docker.network=frontend"
1012
- "traefik.http.routers.idp-employee_${COMPOSE_PROJECT_NAME:?}.rule=Host(`idp-employee.${COMPOSE_DOMAIN:?}`)"
11-
- "traefik.http.services.idp-employee_${COMPOSE_PROJECT_NAME:?}.loadbalancer.server.port=9400"
13+
expose:
14+
- "80"
1215
command:
1316
[
17+
"--port",
18+
"80",
1419
"--user-claims",
1520
'{"sub": "user", "email": "user@example.com", "groups": ["authenticated"]}',
1621
"--user-claims",

‎web/profiles/custom/os2loop/modules/os2loop_alert/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_alert\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Form\ConfigFormBase;
78
use Drupal\Core\Form\FormStateInterface;
89
use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -40,8 +41,8 @@ final class SettingsForm extends ConfigFormBase {
4041
/**
4142
* Constructor.
4243
*/
43-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
44-
parent::__construct($config_factory);
44+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
45+
parent::__construct($config_factory, $typedConfigManager);
4546
$this->settings = $settings;
4647
}
4748

@@ -51,6 +52,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
5152
public static function create(ContainerInterface $container) {
5253
return new static(
5354
$container->get('config.factory'),
55+
$container->get('config.typed'),
5456
$container->get(Settings::class)
5557
);
5658
}

‎web/profiles/custom/os2loop/modules/os2loop_analytics/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_analytics\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Form\ConfigFormBase;
78
use Drupal\Core\Form\FormStateInterface;
89
use Drupal\os2loop_settings\Settings;
@@ -30,8 +31,8 @@ final class SettingsForm extends ConfigFormBase {
3031
/**
3132
* Constructor.
3233
*/
33-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
34-
parent::__construct($config_factory);
34+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
35+
parent::__construct($config_factory, $typedConfigManager);
3536
$this->settings = $settings;
3637
}
3738

@@ -41,6 +42,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
4142
public static function create(ContainerInterface $container) {
4243
return new static(
4344
$container->get('config.factory'),
45+
$container->get('config.typed'),
4446
$container->get(Settings::class)
4547
);
4648
}

‎web/profiles/custom/os2loop/modules/os2loop_cookies/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_cookies\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Form\ConfigFormBase;
78
use Drupal\Core\Form\FormStateInterface;
89
use Drupal\os2loop_settings\Settings;
@@ -30,8 +31,8 @@ final class SettingsForm extends ConfigFormBase {
3031
/**
3132
* Constructor.
3233
*/
33-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
34-
parent::__construct($config_factory);
34+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
35+
parent::__construct($config_factory, $typedConfigManager);
3536
$this->settings = $settings;
3637
}
3738

@@ -41,6 +42,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
4142
public static function create(ContainerInterface $container) {
4243
return new static(
4344
$container->get('config.factory'),
45+
$container->get('config.typed'),
4446
$container->get(Settings::class)
4547
);
4648
}

‎web/profiles/custom/os2loop/modules/os2loop_documents/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_documents\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
78
use Drupal\Core\Entity\EntityTypeManagerInterface;
89
use Drupal\Core\Form\ConfigFormBase;
@@ -41,8 +42,8 @@ final class SettingsForm extends ConfigFormBase {
4142
/**
4243
* Constructor.
4344
*/
44-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings, EntityTypeManagerInterface $entityTypeManager) {
45-
parent::__construct($config_factory);
45+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings, EntityTypeManagerInterface $entityTypeManager) {
46+
parent::__construct($config_factory, $typedConfigManager);
4647
$this->settings = $settings;
4748
$this->fileStorage = $entityTypeManager->getStorage('file');
4849
}
@@ -53,6 +54,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
5354
public static function create(ContainerInterface $container) {
5455
return new static(
5556
$container->get('config.factory'),
57+
$container->get('config.typed'),
5658
$container->get(Settings::class),
5759
$container->get('entity_type.manager')
5860
);

‎web/profiles/custom/os2loop/modules/os2loop_flag_content/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_flag_content\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Form\ConfigFormBase;
78
use Drupal\Core\Form\FormStateInterface;
89
use Drupal\node\Entity\NodeType;
@@ -31,8 +32,8 @@ final class SettingsForm extends ConfigFormBase {
3132
/**
3233
* Constructor.
3334
*/
34-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
35-
parent::__construct($config_factory);
35+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
36+
parent::__construct($config_factory, $typedConfigManager);
3637
$this->settings = $settings;
3738
}
3839

@@ -42,6 +43,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
4243
public static function create(ContainerInterface $container) {
4344
return new static(
4445
$container->get('config.factory'),
46+
$container->get('config.typed'),
4547
$container->get(Settings::class)
4648
);
4749
}

‎web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_mail_notifications\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Entity\EntityFieldManagerInterface;
78
use Drupal\Core\Form\ConfigFormBase;
89
use Drupal\Core\Form\FormStateInterface;
@@ -40,8 +41,8 @@ final class SettingsForm extends ConfigFormBase {
4041
/**
4142
* Constructor.
4243
*/
43-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings, EntityFieldManagerInterface $entityFieldManager) {
44-
parent::__construct($config_factory);
44+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings, EntityFieldManagerInterface $entityFieldManager) {
45+
parent::__construct($config_factory, $typedConfigManager);
4546
$this->settings = $settings;
4647
$this->entityFieldManager = $entityFieldManager;
4748
}
@@ -52,6 +53,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
5253
public static function create(ContainerInterface $container) {
5354
return new static(
5455
$container->get('config.factory'),
56+
$container->get('config.typed'),
5557
$container->get(Settings::class),
5658
$container->get('entity_field.manager')
5759
);

‎web/profiles/custom/os2loop/modules/os2loop_member_list/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_member_list\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Form\ConfigFormBase;
78
use Drupal\Core\Form\FormStateInterface;
89
use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -32,8 +33,8 @@ final class SettingsForm extends ConfigFormBase {
3233
/**
3334
* Constructor.
3435
*/
35-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
36-
parent::__construct($config_factory);
36+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
37+
parent::__construct($config_factory, $typedConfigManager);
3738
$this->settings = $settings;
3839
}
3940

@@ -43,6 +44,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
4344
public static function create(ContainerInterface $container) {
4445
return new static(
4546
$container->get('config.factory'),
47+
$container->get('config.typed'),
4648
$container->get(Settings::class)
4749
);
4850
}

‎web/profiles/custom/os2loop/modules/os2loop_post/src/Form/SettingsForm.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2loop_post\Form;
44

55
use Drupal\Core\Config\ConfigFactoryInterface;
6+
use Drupal\Core\Config\TypedConfigManagerInterface;
67
use Drupal\Core\Form\ConfigFormBase;
78
use Drupal\Core\Form\FormStateInterface;
89
use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -32,8 +33,8 @@ final class SettingsForm extends ConfigFormBase {
3233
/**
3334
* Constructor.
3435
*/
35-
public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
36-
parent::__construct($config_factory);
36+
public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
37+
parent::__construct($config_factory, $typedConfigManager);
3738
$this->settings = $settings;
3839
}
3940

@@ -43,6 +44,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
4344
public static function create(ContainerInterface $container) {
4445
return new static(
4546
$container->get('config.factory'),
47+
$container->get('config.typed'),
4648
$container->get(Settings::class)
4749
);
4850
}

0 commit comments

Comments
 (0)