Form: fixed calling setMethod() after 8df9520

Author: dg

composer.json

@@ -27,6 +27,7 @@
 	},
 	"require-dev": {
 		"nette/tester": "~1.3",
+		"nette/forms": "~2.2",
 		"latte/latte": "~2.2.2"
 	},
 	"conflict": {

src/Application/UI/Form.php

@@ -68,20 +68,20 @@ protected function attached($presenter)
 				$this->getElementPrototype()->id = 'frm-' . $name;
 			}
 
-			if (!$this->getAction()) {
-				$this->setAction(new Link($presenter, 'this', array()));
-				$signal = new Nette\Forms\Controls\HiddenField($name . self::NAME_SEPARATOR . 'submit');
-				$signal->setOmitted()->setHtmlId(FALSE);
-				$this[Presenter::SIGNAL_KEY] = $signal;
-			}
-
 			if (iterator_count($this->getControls()) && $this->isSubmitted()) {
 				foreach ($this->getControls() as $control) {
 					if (!$control->isDisabled()) {
 						$control->loadHttpData();
 					}
 				}
 			}
+
+			if (!$this->getAction()) {
+				$this->setAction(new Link($presenter, 'this', array()));
+				$signal = new Nette\Forms\Controls\HiddenField($name . self::NAME_SEPARATOR . 'submit');
+				$signal->setOmitted()->setHtmlId(FALSE);
+				$this[Presenter::SIGNAL_KEY] = $signal;
+			}
 		}
 		parent::attached($presenter);
 	}

tests/Application/Form.phpt

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Test: Nette\Application\UI\Form
+ */
+
+use Nette\Application\UI,
+	Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class TestPresenter extends UI\Presenter
+{
+
+}
+
+
+test(function() {
+	$presenter = new TestPresenter;
+	$form = new UI\Form($presenter, 'name');
+	$form->setMethod($form::GET); // must not throw exception
+});
+
+
+test(function() { // compatibility with 2.0
+	$presenter = new TestPresenter;
+	$form = new UI\Form;
+	$form->setAction('action');
+	$presenter['name'] = $form;
+	Assert::false(isset($form[TestPresenter::SIGNAL_KEY]));
+});