From 2a68d60d6efb1b55b1d8376836b0f4e0d01325be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Vogel?= Date: Wed, 24 Oct 2012 18:40:10 +0200 Subject: [PATCH 1/2] Changed way of getting current URL to avoid problems with URL parameters --- Grid/Grid.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Grid/Grid.php b/Grid/Grid.php index 0ae3c39..5d433a9 100644 --- a/Grid/Grid.php +++ b/Grid/Grid.php @@ -265,8 +265,8 @@ public function getRouteUrl() if ($this->routeforced != '') { return $this->routeforced; } else { - return $this->router->generate($this->request->get('_route')); - } + return $currentUrl = $this->request->getUri(); + } } public function setRouteForced($route) From 4163bc1d3bc04affef7efc10c8cef0c4fbeecdb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Vogel?= Date: Wed, 24 Oct 2012 18:42:22 +0200 Subject: [PATCH 2/2] removed wrong character --- Grid/Grid.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Grid/Grid.php b/Grid/Grid.php index 5d433a9..7122860 100644 --- a/Grid/Grid.php +++ b/Grid/Grid.php @@ -266,7 +266,7 @@ public function getRouteUrl() return $this->routeforced; } else { return $currentUrl = $this->request->getUri(); - } + } } public function setRouteForced($route) @@ -311,16 +311,16 @@ public function getSubGrid() { return $this->subGrid; } - - /** - * @return \Doctrine\ORM\QueryBuilder - */ - public function getQueryBuilder() - { - return $this->qb; - } - - + + /** + * @return \Doctrine\ORM\QueryBuilder + */ + public function getQueryBuilder() + { + return $this->qb; + } + + public function render() {