Presenter: don't mix GET & POST params in AJAX when form is submitted […

…Closes nette/forms#33][Closes nette/nette#1061] (#127)
nette · Apr 29, 2016 · c0931f4 · c0931f4
1 parent 9d71d64
commit c0931f4
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/src/Application/UI/Form.php b/src/Application/UI/Form.php
@@ -76,7 +76,7 @@ protected function attached($presenter)
 				$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;
+				$this['_' . Presenter::SIGNAL_KEY . '_'] = $signal;
 			}
 		}
 		parent::attached($presenter);

diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -1209,11 +1209,13 @@ private function initGlobalParameters()
 		$selfParams = [];
 
 		$params = $this->request->getParameters();
-		if ($this->isAjax()) {
-			$params += $this->request->getPost();
-		}
-		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();
+			if (($tmp = $this->request->getPost(self::SIGNAL_KEY)) !== NULL) {
+				$params[self::SIGNAL_KEY] = $tmp;
+			}
 		}
 
 		foreach ($params as $key => $value) {

diff --git a/tests/UI/Presenter.parameters.phpt b/tests/UI/Presenter.parameters.phpt
@@ -66,15 +66,33 @@ test(function () {
 	$presenter->run(new Application\Request('Foo', 'POST', [], [
 		'do' => 'foo'
 	]));
+	Assert::null($presenter->getSignal());
+});
+
+test(function () {
+	//_signal_ in POST
+	$presenter = createPresenter();
+	$presenter->run(new Application\Request('Foo', 'POST', [], [
+		'_do_' => 'foo'
+	]));
 	Assert::same(['', 'foo'], $presenter->getSignal());
 });
 
 test(function () {
-	//signal in POST overwriting empty GET
+	//signal in POST not overwriting GET
 	$presenter = createPresenter();
 	$presenter->run(new Application\Request('Foo', 'POST', ['do' => NULL], [
 		'do' => 'foo'
 	]));
+	Assert::null($presenter->getSignal());
+});
+
+test(function () {
+	//_signal_ in POST overwriting GET
+	$presenter = createPresenter();
+	$presenter->run(new Application\Request('Foo', 'POST', ['do' => 'bar'], [
+		'_do_' => 'foo'
+	]));
 	Assert::same(['', 'foo'], $presenter->getSignal());
 });
 
@@ -89,11 +107,21 @@ test(function () {
 });
 
 test(function () {
-	//AJAX: signal in POST overwriting empty GET
+	//AJAX: signal in POST overwriting GET
 	$presenter = createPresenter();
 	$presenter->ajax = TRUE;
-	$presenter->run(new Application\Request('Foo', 'POST', ['do' => NULL], [
+	$presenter->run(new Application\Request('Foo', 'POST', ['do' => 'bar'], [
 		'do' => 'foo'
 	]));
 	Assert::same(['', 'foo'], $presenter->getSignal());
 });
+
+test(function () {
+	//AJAX: _signal_ in POST overwriting GET
+	$presenter = createPresenter();
+	$presenter->ajax = TRUE;
+	$presenter->run(new Application\Request('Foo', 'POST', ['do' => 'bar'], [
+		'_do_' => 'foo'
+	]));
+	Assert::same(['', 'foo'], $presenter->getSignal());
+});