getFieldByName now checks the list of actions in additon to just the …

…field list
travi · Jul 3, 2014 · f32c529 · f32c529
1 parent 7ded5f2
commit f32c529
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/php/framework/src/travi/framework/components/Forms/Form.php b/php/framework/src/travi/framework/components/Forms/Form.php
@@ -119,6 +119,23 @@ public function mapErrorMessagesToFields($errors)
         }
     }
 
+    public function getFieldByName($fieldName)
+    {
+        $field = parent::getFieldByName($fieldName);
+
+        if (!isset($field)) {
+            /** @var Field $action */
+            foreach ($this->actions as $action) {
+                if (is_a($action, 'travi\\framework\\components\\Forms\\Field') && $fieldName === $action->getName()) {
+                    $field = $action;
+                }
+            }
+        }
+
+        return $field;
+    }
+
+
     public function hasErrors()
     {
         return !$this->isValid();

diff --git a/php/framework/src/travi/framework/components/Forms/FormElementGroup.php b/php/framework/src/travi/framework/components/Forms/FormElementGroup.php
@@ -94,6 +94,7 @@ public function getFieldByName($fieldName)
             ) {
                 return $element;
             } elseif (is_a($element, 'travi\\framework\\components\\Forms\\FormElementGroup')) {
+                /** @var FormElementGroup $element */
                 $field = $element->getFieldByName($fieldName);
 
                 if (!empty($field)) {

diff --git a/php/framework/test/php/content/components/form/FormTest.php b/php/framework/test/php/content/components/form/FormTest.php
@@ -6,6 +6,7 @@
     travi\framework\components\Forms\inputs\DateInput,
     travi\framework\components\Forms\inputs\TextInput;
 use travi\framework\components\Forms\SubmitButton;
+use travi\framework\view\objects\LinkView;
 
 class FormTest extends PHPUnit_Framework_TestCase
 {
@@ -133,6 +134,16 @@ public function testValidationsArePassedInGetDependencies()
         $this->assertSame($validations, $dependencies['validations'][$anyField->getName()]);
     }
 
+    public function testThatActionInputCanBeRetievedByName()
+    {
+        $action = new SubmitButton();
+
+        $this->form->addAction(new LinkView('some text', 'some href'));
+        $this->form->addAction($action);
+
+        $this->assertSame($action, $this->form->getFieldByName('submit'));
+    }
+
     public function testValidationErrorsMappedToProperFields()
     {
         $textName = 'test_text';