diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-08-07 20:10:07 +0200 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-08-07 20:10:07 +0200 |
| commit | 55333dfd21f8d1aeefbf740121d39304cc051704 (patch) | |
| tree | 95ab71ab7653fe656fcadbfe1cbc1cdc1f27c682 /src/Wallabag | |
| parent | 6ecdd48a3fadf076e062b6c634ae80f261c43e23 (diff) | |
| parent | 48ffc5a4b659bd671f996c7ee8aa7a059427afa7 (diff) | |
| download | wallabag-55333dfd21f8d1aeefbf740121d39304cc051704.tar.gz wallabag-55333dfd21f8d1aeefbf740121d39304cc051704.tar.zst wallabag-55333dfd21f8d1aeefbf740121d39304cc051704.zip | |
Merge pull request #1293 from wallabag/v2-items-per-page
get itemsPerPage for unread/fav/archive views
Diffstat (limited to 'src/Wallabag')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 49714d02..29e0ffb0 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
| @@ -99,6 +99,7 @@ class EntryController extends Controller | |||
| 99 | ->getRepository('WallabagCoreBundle:Entry') | 99 | ->getRepository('WallabagCoreBundle:Entry') |
| 100 | ->findUnreadByUser($this->getUser()->getId()); | 100 | ->findUnreadByUser($this->getUser()->getId()); |
| 101 | 101 | ||
| 102 | $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); | ||
| 102 | $entries->setCurrentPage($page); | 103 | $entries->setCurrentPage($page); |
| 103 | 104 | ||
| 104 | return $this->render( | 105 | return $this->render( |
| @@ -123,6 +124,7 @@ class EntryController extends Controller | |||
| 123 | ->getRepository('WallabagCoreBundle:Entry') | 124 | ->getRepository('WallabagCoreBundle:Entry') |
| 124 | ->findArchiveByUser($this->getUser()->getId()); | 125 | ->findArchiveByUser($this->getUser()->getId()); |
| 125 | 126 | ||
| 127 | $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); | ||
| 126 | $entries->setCurrentPage($page); | 128 | $entries->setCurrentPage($page); |
| 127 | 129 | ||
| 128 | return $this->render( | 130 | return $this->render( |
| @@ -147,6 +149,7 @@ class EntryController extends Controller | |||
| 147 | ->getRepository('WallabagCoreBundle:Entry') | 149 | ->getRepository('WallabagCoreBundle:Entry') |
| 148 | ->findStarredByUser($this->getUser()->getId()); | 150 | ->findStarredByUser($this->getUser()->getId()); |
| 149 | 151 | ||
| 152 | $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); | ||
| 150 | $entries->setCurrentPage($page); | 153 | $entries->setCurrentPage($page); |
| 151 | 154 | ||
| 152 | return $this->render( | 155 | return $this->render( |