Skip to content
Snippets Groups Projects
Commit 5d988826 authored by Ralf Zimmermann's avatar Ralf Zimmermann Committed by Morton Jonuschat
Browse files

[BUGFIX] EXT:form - bring back "Show message in label"

Respect the "Show message in label" option for validations.

Resolves: #71514
Releases: master
Change-Id: Id22885c88915fe38ffae0068a6d0c19592fed828
Reviewed-on: https://review.typo3.org/44946


Reviewed-by: default avatarBjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: default avatarBjoern Jacob <bjoern.jacob@tritum.de>
Reviewed-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
Reviewed-by: default avatarCarlos Meyer <cm@davitec.de>
Reviewed-by: default avatarMorton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: default avatarMorton Jonuschat <m.jonuschat@mojocode.de>
parent 52377dc8
No related branches found
No related tags found
No related merge requests found
......@@ -147,7 +147,12 @@ class ValidationBuilder
if ($validator instanceof AbstractValidator) {
$validator->setRawArgument($rawArgument);
$validator->setFormUtility($this->formUtility);
$mandatoryMessage = $validator->renderMessage($ruleArguments['message.'], $ruleArguments['message']);
if ((int)$ruleArguments['showMessage'] === 1) {
$mandatoryMessage = $validator->renderMessage($ruleArguments['message.'], $ruleArguments['message']);
} else {
$mandatoryMessage = NULL;
}
$this->rules[$this->configuration->getPrefix()][$fieldName][] = array(
'validator' => $validator,
......@@ -233,7 +238,9 @@ class ValidationBuilder
if ($this->getRulesByElementName($key)) {
$rules = $this->getRulesByElementName($key);
foreach ($rules as $rule) {
$mandatoryMessages[] = $rule['mandatoryMessage'];
if ($rule['mandatoryMessage']) {
$mandatoryMessages[] = $rule['mandatoryMessage'];
}
}
}
return $mandatoryMessages;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment