Skip to content

Commit 6355d86

Browse files
committed
fix layout block error order
1 parent 7950884 commit 6355d86

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

Model/LayoutBlockFormListener.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,7 @@ public function validate(FormEvent &$event, $contentObject)
160160
$errors = $this->validator->validate($contentObject);
161161

162162
if (count($errors) > 0) {
163-
/** @var \Symfony\Component\Validator\ConstraintViolation $error */
164-
foreach ($errors->getIterator() as $error) {
165-
$fieldName = $error->getPropertyPath();
166-
/** @var \Symfony\Component\Form\Form $field */
167-
$field = $form->get('content')->get($fieldName);
168-
$field->addError(
169-
new FormError($error->getMessage(), $error->getMessageTemplate(), $error->getMessageParameters(
170-
), $error->getMessagePluralization())
171-
);
172163

173-
}
174164
if ($contentObject->getId()) {
175165
$message = $this->admin->getTranslator()->trans(
176166
'message.layout_block_not_edited',
@@ -187,6 +177,18 @@ public function validate(FormEvent &$event, $contentObject)
187177
}
188178
$form->addError(new FormError($message));
189179

180+
/** @var \Symfony\Component\Validator\ConstraintViolation $error */
181+
foreach ($errors->getIterator() as $error) {
182+
$fieldName = $error->getPropertyPath();
183+
/** @var \Symfony\Component\Form\Form $field */
184+
$field = $form->get('content')->get($fieldName);
185+
$field->addError(
186+
new FormError($error->getMessage(), $error->getMessageTemplate(), $error->getMessageParameters(
187+
), $error->getMessagePluralization())
188+
);
189+
190+
}
191+
190192
}
191193

192194
return $event;

0 commit comments

Comments
 (0)