From ca5f042957f297cfb99fdae9f85c514e5628c1f4 Mon Sep 17 00:00:00 2001 From: Maciej Kobus Date: Fri, 26 Jan 2018 11:12:40 +0100 Subject: [PATCH 1/2] EZP-28703: Error 400 after trying to register new user (#213) --- lib/Data/Mapper/UserRegisterMapper.php | 1 + lib/Form/EventSubscriber/UserFieldsSubscriber.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Data/Mapper/UserRegisterMapper.php b/lib/Data/Mapper/UserRegisterMapper.php index 3b05b1765..99fba4a63 100644 --- a/lib/Data/Mapper/UserRegisterMapper.php +++ b/lib/Data/Mapper/UserRegisterMapper.php @@ -59,6 +59,7 @@ public function mapToFormData() $data = new UserRegisterData([ 'contentType' => $contentType, 'mainLanguageCode' => $this->params['language'], + 'enabled' => true, ]); $data->addParentGroup($this->parentGroupLoader->loadGroup()); diff --git a/lib/Form/EventSubscriber/UserFieldsSubscriber.php b/lib/Form/EventSubscriber/UserFieldsSubscriber.php index df457381a..c3ce3e8b1 100644 --- a/lib/Form/EventSubscriber/UserFieldsSubscriber.php +++ b/lib/Form/EventSubscriber/UserFieldsSubscriber.php @@ -62,7 +62,7 @@ private function handleUserCreateData(UserCreateData $data) $data->login = $userAccountFieldData->username; $data->email = $userAccountFieldData->email; $data->password = $userAccountFieldData->password; - $data->enabled = $userAccountFieldData->enabled; + $data->enabled = $data->enabled ?? $userAccountFieldData->enabled; /** @var Value $userValue */ $userValue = clone $data->contentType From 093cb493123a3de99f4b56510b4608b288e6e974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Serwatka?= Date: Fri, 26 Jan 2018 11:18:16 +0100 Subject: [PATCH 2/2] [composer] Updated license to meet new requirements --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 523595e9d..6f498ea50 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "ezsystems/repository-forms", "description": "Use Symfony forms with eZ Platform repository objects", - "license": "GPL-2.0", + "license": "GPL-2.0-only", "type": "ezplatform-bundle", "authors": [ {