From 3c6d39dc56f9de117749269121c56e0c4e1a26fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 2 Apr 2019 11:58:24 +0200
Subject: [PATCH] update address validation

---
 CHANGELOG.md                           | 4 ++++
 Controller/PersonAddressController.php | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc3660776..2d8755d02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,3 +35,7 @@ Version 1.5.5
 
 - Fix bug in accompanying period filter
 
+Branche master
+==============
+
+- Update address validation
diff --git a/Controller/PersonAddressController.php b/Controller/PersonAddressController.php
index bbece0d6d..633a43940 100644
--- a/Controller/PersonAddressController.php
+++ b/Controller/PersonAddressController.php
@@ -112,7 +112,7 @@ class PersonAddressController extends Controller
 
         $person->addAddress($address);
 
-        if ($form->isSubmitted()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
             if (count($validatePersonErrors) !== 0) {
@@ -194,7 +194,7 @@ class PersonAddressController extends Controller
         $form = $this->createEditForm($person, $address);
         $form->handleRequest($request);
 
-        if ($request->getMethod() === 'POST') {
+        if ($form->isSubmitted() and $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
             if (count($validatePersonErrors) !== 0) {