Form: uses underscored signal parameter _do only in POST forms

Hidden field is created in receiveHttpData() because method can be altered after attached(), but not after HTTP data are loaded. Related to 647af4e

Author: dg

src/Application/UI/Form.php

@@ -59,25 +59,21 @@ protected function attached($presenter)
 	{
 		if ($presenter instanceof Presenter) {
 			$name = $this->lookupPath(Presenter::class);
-
 			if (!isset($this->getElementPrototype()->id)) {
 				$this->getElementPrototype()->id = 'frm-' . $name;
 			}
+			if (!$this->getAction()) {
+				$this->setAction(new Link($presenter, $name . self::NAME_SEPARATOR . 'submit'));
+			}
 
-			if (iterator_count($this->getControls()) && $this->isSubmitted()) {
-				foreach ($this->getControls() as $control) {
+			$controls = $this->getControls();
+			if (iterator_count($controls) && $this->isSubmitted()) {
+				foreach ($controls as $control) {
 					if (!$control->isDisabled()) {
 						$control->loadHttpData();
 					}
 				}
 			}
-
-			if (!$this->getAction()) {
-				$this->setAction(new Link($presenter, 'this', []));
-				$signal = new Nette\Forms\Controls\HiddenField($name . self::NAME_SEPARATOR . 'submit');
-				$signal->setOmitted()->setHtmlId(FALSE);
-				$this['_' . Presenter::SIGNAL_KEY . '_'] = $signal;
-			}
 		}
 		parent::attached($presenter);
 	}
@@ -100,11 +96,20 @@ public function isAnchored()
 	protected function receiveHttpData()
 	{
 		$presenter = $this->getPresenter();
+		$isPost = $this->getMethod() === self::POST;
+
+		$action = $this->getAction();
+		if ($action instanceof Link) {
+			$this[($isPost ? '_' : '') . Presenter::SIGNAL_KEY] =
+				(new Nette\Forms\Controls\HiddenField($action->getDestination()))
+				->setOmitted()->setHtmlId(FALSE);
+			$this->setAction(new Link($presenter, 'this'));
+		}
+
 		if (!$presenter->isSignalReceiver($this, 'submit')) {
 			return;
 		}
 
-		$isPost = $this->getMethod() === self::POST;
 		$request = $presenter->getRequest();
 		if ($request->isMethod('forward') || $request->isMethod('post') !== $isPost) {
 			return;

src/Application/UI/Link.php

@@ -31,7 +31,7 @@ class Link
 	/**
 	 * Link specification.
 	 */
-	public function __construct(PresenterComponent $component, $destination, array $params)
+	public function __construct(PresenterComponent $component, $destination, array $params = [])
 	{
 		$this->component = $component;
 		$this->destination = $destination;

src/Application/UI/Presenter.php

@@ -1212,7 +1212,7 @@ private function initGlobalParameters()
 		$selfParams = [];
 
 		$params = $this->request->getParameters();
-		if (($tmp = $this->request->getPost('_' . self::SIGNAL_KEY . '_')) !== NULL) {
+		if (($tmp = $this->request->getPost('_' . self::SIGNAL_KEY)) !== NULL) {
 			$params[self::SIGNAL_KEY] = $tmp;
 		} elseif ($this->isAjax()) {
 			$params += $this->request->getPost();

tests/UI/Presenter.parameters.phpt

@@ -73,7 +73,7 @@ test(function () {
 	//_signal_ in POST
 	$presenter = createPresenter();
 	$presenter->run(new Application\Request('Foo', 'POST', [], [
-		'_do_' => 'foo'
+		'_do' => 'foo'
 	]));
 	Assert::same(['', 'foo'], $presenter->getSignal());
 });
@@ -91,7 +91,7 @@ test(function () {
 	//_signal_ in POST overwriting GET
 	$presenter = createPresenter();
 	$presenter->run(new Application\Request('Foo', 'POST', ['do' => 'bar'], [
-		'_do_' => 'foo'
+		'_do' => 'foo'
 	]));
 	Assert::same(['', 'foo'], $presenter->getSignal());
 });
@@ -121,7 +121,7 @@ test(function () {
 	$presenter = createPresenter();
 	$presenter->ajax = TRUE;
 	$presenter->run(new Application\Request('Foo', 'POST', ['do' => 'bar'], [
-		'_do_' => 'foo'
+		'_do' => 'foo'
 	]));
 	Assert::same(['', 'foo'], $presenter->getSignal());
 });