[TASK] Prevent adding valid class to fields with empty values

romm · Mar 23, 2017 · ffc7137 · ffc7137
1 parent b73c5e2
commit ffc7137
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/Classes/ViewHelpers/ClassViewHelper.php b/Classes/ViewHelpers/ClassViewHelper.php
@@ -241,10 +241,15 @@ protected function getPropertyValidClass(Result $propertyResult)
         $formObject = $this->formService->getFormObject();
         $field = $formObject->getConfiguration()->getField($this->fieldName);
 
-        if (false === $propertyResult->hasErrors()
+        if ($formObject->hasForm()
+            && false === $propertyResult->hasErrors()
             && false === $formObject->getFormResult()->fieldIsDeactivated($field)
         ) {
-            $result .= ' ' . $this->classValue;
+            $fieldValue = ObjectAccess::getProperty($formObject->getForm(), $this->fieldName);
+
+            if (false === empty($fieldValue)) {
+                $result .= ' ' . $this->classValue;
+            }
         }
 
         return $result;

diff --git a/Resources/Public/JavaScript/Field/Formz.Field.js b/Resources/Public/JavaScript/Field/Formz.Field.js
@@ -494,9 +494,17 @@ Fz.Field = (function () {
                             Fz.addClass(element, className);
                         });
                     } else {
-                        loopOnClasses('valid', function (element, className) {
-                            Fz.addClass(element, className);
-                        });
+                        var value = states.field.getValue();
+
+                        if (typeof value === 'string'
+                            && value !== ''
+                            || typeof value === 'object'
+                            && value.length > 0
+                        ) {
+                            loopOnClasses('valid', function (element, className) {
+                                Fz.addClass(element, className);
+                            });
+                        }
                     }
                 });
 

diff --git a/Tests/Unit/ViewHelpers/ClassViewHelperTest.php b/Tests/Unit/ViewHelpers/ClassViewHelperTest.php
@@ -8,6 +8,7 @@
 use Romm\Formz\Exceptions\UnregisteredConfigurationException;
 use Romm\Formz\Service\ViewHelper\FieldViewHelperService;
 use Romm\Formz\Service\ViewHelper\FormViewHelperService;
+use Romm\Formz\Tests\Fixture\Form\DefaultForm;
 use Romm\Formz\ViewHelpers\ClassViewHelper;
 use TYPO3\CMS\Extbase\Validation\Error;
 
@@ -206,8 +207,11 @@ protected function getDefaultFormService()
             ->setMethods(['getFormObject'])
             ->getMock();
 
+        $formObject = $this->getDefaultFormObject();
         $service->method('getFormObject')
-            ->willReturn($this->getDefaultFormObject());
+            ->willReturn($formObject);
+
+        $formObject->setForm(new DefaultForm);
 
         return $service;
     }