From 7ae73d3938b45bc1c39342f3c2e05d15cf6da692 Mon Sep 17 00:00:00 2001 From: Jan Smid Date: Wed, 27 Mar 2013 16:41:37 +0100 Subject: [PATCH 1/3] feature: gridPaginator(). better setting templatePath. --- libs/NiftyGrid/GridPaginator.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/libs/NiftyGrid/GridPaginator.php b/libs/NiftyGrid/GridPaginator.php index 64579a6..042c0b4 100644 --- a/libs/NiftyGrid/GridPaginator.php +++ b/libs/NiftyGrid/GridPaginator.php @@ -21,16 +21,21 @@ class GridPaginator extends \Nette\Application\UI\Control */ public $paginator; - public function __construct() + /** @var string */ + protected $templatePath = null; + + + public function __construct($templatePath = null) { parent::__construct(); - $this->paginator = new Paginator; + $this->paginator = new Paginator; + $this->templatePath = $templatePath; } public function render() { $this->template->paginator = $this->paginator; - $this->template->setFile(__DIR__ . '/../../templates/paginator.latte'); + $this->template->setFile(!empty($this->templatePath) ? $this->templatePath : __DIR__ . '/../../templates/paginator.latte'); $this->template->render(); } @@ -42,4 +47,13 @@ public function loadState(array $params) parent::loadState($params); $this->paginator->page = $this->page; } + + /** + * @param string $templatePath + */ + protected function setTemplate($templatePath) + { + $this->templatePath = $templatePath; + } + } \ No newline at end of file From 0684ec79bd68fb15c8435dbd2e769d26cb6b2083 Mon Sep 17 00:00:00 2001 From: Jan Smid Date: Thu, 28 Mar 2013 16:29:32 +0100 Subject: [PATCH 2/3] bugfix: GridPaginator::setTemplate() --- libs/NiftyGrid/GridPaginator.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/NiftyGrid/GridPaginator.php b/libs/NiftyGrid/GridPaginator.php index 042c0b4..7936ab0 100644 --- a/libs/NiftyGrid/GridPaginator.php +++ b/libs/NiftyGrid/GridPaginator.php @@ -28,8 +28,8 @@ class GridPaginator extends \Nette\Application\UI\Control public function __construct($templatePath = null) { parent::__construct(); - $this->paginator = new Paginator; - $this->templatePath = $templatePath; + $this->paginator = new Paginator; + $this->setTemplate($templatePath); } public function render() @@ -51,9 +51,9 @@ public function loadState(array $params) /** * @param string $templatePath */ - protected function setTemplate($templatePath) + public function setTemplate($templatePath) { $this->templatePath = $templatePath; } -} \ No newline at end of file +} From 308323ac69f2624602bb8bed857e829410ca6560 Mon Sep 17 00:00:00 2001 From: Jan Smid Date: Thu, 28 Mar 2013 16:45:22 +0100 Subject: [PATCH 3/3] bugfix: GridPaginator::setTemplate() - only code cleanout --- libs/NiftyGrid/GridPaginator.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/NiftyGrid/GridPaginator.php b/libs/NiftyGrid/GridPaginator.php index 7936ab0..9c45b14 100644 --- a/libs/NiftyGrid/GridPaginator.php +++ b/libs/NiftyGrid/GridPaginator.php @@ -16,9 +16,7 @@ class GridPaginator extends \Nette\Application\UI\Control /** @persistent int */ public $page = 1; - /** - * @var Paginator - */ + /** @var Paginator */ public $paginator; /** @var string */