Added support for request restore with ajax

nette · Nov 6, 2015 · 30f2ad1 · 30f2ad1
1 parent 190f630
commit 30f2ad1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -1092,7 +1092,7 @@ public function storeRequest($expiration = '+ 10 minutes')
 			$key = Nette\Utils\Random::generate(5);
 		} while (isset($session[$key]));
 
-		$session[$key] = [$this->getUser()->getId(), $this->request];
+		$session[$key] = [$this->getUser()->getId(), $this->request, $this->httpRequest->getUrl()];
 		$session->setExpiration($expiration, $key);
 		return $key;
 	}
@@ -1110,7 +1110,11 @@ public function restoreRequest($key)
 			return;
 		}
 		$request = clone $session[$key][1];
+		$url = $session[$key][2];
 		unset($session[$key]);
+		if($this->isAjax()) {
+			$this->redirectUrl($url);
+		}
 		$request->setFlag(Application\Request::RESTORED, TRUE);
 		$params = $request->getParameters();
 		$params[self::FLASH_KEY] = $this->getParameter(self::FLASH_KEY);