Merge pull request FluidTYPO3#291 from NamelessCoder/hasvalidator

[TASK] Make Form / HasValidator condition validatorName optional
uscreenFikret · Aug 7, 2013 · 75efd43 · 75efd43
2 parents ddbc3a8 + 861a2cf
commit 75efd43
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/ViewHelpers/If/Form/HasValidatorViewHelper.php b/Classes/ViewHelpers/If/Form/HasValidatorViewHelper.php
@@ -70,7 +70,7 @@ public function injectOwnReflectionService(Tx_Extbase_Reflection_Service $reflec
 	 * @param Tx_Extbase_DomainObject_DomainObjectInterface $object Optional object - if not specified, grabs the associated form object
 	 * @return string
 	 */
-	public function render($property, $validatorName, Tx_Extbase_DomainObject_DomainObjectInterface $object = NULL) {
+	public function render($property, $validatorName = NULL, Tx_Extbase_DomainObject_DomainObjectInterface $object = NULL) {
 		if ($object === NULL) {
 			$object = $this->getFormObject();
 			$className = get_class($object);
@@ -91,7 +91,7 @@ public function render($property, $validatorName, Tx_Extbase_DomainObject_Domain
 			}
 		}
 		$annotations = $this->ownReflectionService->getPropertyTagValues($className, $property, 'validate');
-		if (in_array('NotEmpty', $annotations) === TRUE) {
+		if (0 < count($annotations) && (NULL === $validatorName || in_array($validatorName, $annotations) === TRUE)) {
 			return $this->renderThenChild();
 		}
 		return $this->renderElseChild();