diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 105 |
1 files changed, 52 insertions, 53 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 006fa396..dc399b8a 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -113,34 +113,7 @@ class EntryController extends Controller | |||
113 | */ | 113 | */ |
114 | public function showUnreadAction(Request $request, $page) | 114 | public function showUnreadAction(Request $request, $page) |
115 | { | 115 | { |
116 | $form = $this->get('form.factory')->create(new EntryFilterType()); | 116 | return $this->showEntries('unread', $request, $page); |
117 | |||
118 | $filterBuilder = $this->getDoctrine() | ||
119 | ->getRepository('WallabagCoreBundle:Entry') | ||
120 | ->findUnreadByUser($this->getUser()->getId()); | ||
121 | |||
122 | if ($request->query->has($form->getName())) { | ||
123 | // manually bind values from the request | ||
124 | $form->submit($request->query->get($form->getName())); | ||
125 | |||
126 | // build the query from the given form object | ||
127 | $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $filterBuilder); | ||
128 | } | ||
129 | |||
130 | $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery()); | ||
131 | $entries = new Pagerfanta($pagerAdapter); | ||
132 | |||
133 | $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); | ||
134 | $entries->setCurrentPage($page); | ||
135 | |||
136 | return $this->render( | ||
137 | 'WallabagCoreBundle:Entry:entries.html.twig', | ||
138 | array( | ||
139 | 'form' => $form->createView(), | ||
140 | 'entries' => $entries, | ||
141 | 'currentPage' => $page, | ||
142 | ) | ||
143 | ); | ||
144 | } | 117 | } |
145 | 118 | ||
146 | /** | 119 | /** |
@@ -155,21 +128,66 @@ class EntryController extends Controller | |||
155 | */ | 128 | */ |
156 | public function showArchiveAction(Request $request, $page) | 129 | public function showArchiveAction(Request $request, $page) |
157 | { | 130 | { |
158 | $form = $this->get('form.factory')->create(new EntryFilterType()); | 131 | return $this->showEntries('archive', $request, $page); |
132 | } | ||
133 | |||
134 | /** | ||
135 | * Shows starred entries for current user. | ||
136 | * | ||
137 | * @param Request $request | ||
138 | * @param int $page | ||
139 | * | ||
140 | * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"}) | ||
141 | * | ||
142 | * @return \Symfony\Component\HttpFoundation\Response | ||
143 | */ | ||
144 | public function showStarredAction(Request $request, $page) | ||
145 | { | ||
146 | return $this->showEntries('starred', $request, $page); | ||
147 | } | ||
159 | 148 | ||
160 | $filterBuilder = $this->getDoctrine() | 149 | /** |
161 | ->getRepository('WallabagCoreBundle:Entry') | 150 | * Global method to retrieve entries depending on the given type |
162 | ->findArchiveByUser($this->getUser()->getId()); | 151 | * It returns the response to be send. |
152 | * | ||
153 | * @param string $type Entries type: unread, starred or archive | ||
154 | * @param Request $request | ||
155 | * @param int $page | ||
156 | * | ||
157 | * @return \Symfony\Component\HttpFoundation\Response | ||
158 | */ | ||
159 | private function showEntries($type, Request $request, $page) | ||
160 | { | ||
161 | $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); | ||
162 | |||
163 | switch ($type) { | ||
164 | case 'starred': | ||
165 | $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId()); | ||
166 | break; | ||
167 | |||
168 | case 'archive': | ||
169 | $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId()); | ||
170 | break; | ||
171 | |||
172 | case 'unread': | ||
173 | $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId()); | ||
174 | break; | ||
175 | |||
176 | default: | ||
177 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); | ||
178 | } | ||
179 | |||
180 | $form = $this->get('form.factory')->create(new EntryFilterType()); | ||
163 | 181 | ||
164 | if ($request->query->has($form->getName())) { | 182 | if ($request->query->has($form->getName())) { |
165 | // manually bind values from the request | 183 | // manually bind values from the request |
166 | $form->submit($request->query->get($form->getName())); | 184 | $form->submit($request->query->get($form->getName())); |
167 | 185 | ||
168 | // build the query from the given form object | 186 | // build the query from the given form object |
169 | $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $filterBuilder); | 187 | $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); |
170 | } | 188 | } |
171 | 189 | ||
172 | $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery()); | 190 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); |
173 | $entries = new Pagerfanta($pagerAdapter); | 191 | $entries = new Pagerfanta($pagerAdapter); |
174 | 192 | ||
175 | $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); | 193 | $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); |
@@ -183,25 +201,6 @@ class EntryController extends Controller | |||
183 | 'currentPage' => $page, | 201 | 'currentPage' => $page, |
184 | ) | 202 | ) |
185 | ); | 203 | ); |
186 | } | ||
187 | |||
188 | /** | ||
189 | * Shows starred entries for current user. | ||
190 | * | ||
191 | * @param Request $request | ||
192 | * @param int $page | ||
193 | * | ||
194 | * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"}) | ||
195 | * | ||
196 | * @return \Symfony\Component\HttpFoundation\Response | ||
197 | */ | ||
198 | public function showStarredAction(Request $request, $page) | ||
199 | { | ||
200 | $form = $this->get('form.factory')->create(new EntryFilterType()); | ||
201 | |||
202 | $filterBuilder = $this->getDoctrine() | ||
203 | ->getRepository('WallabagCoreBundle:Entry') | ||
204 | ->findStarredByUser($this->getUser()->getId()); | ||
205 | 204 | ||
206 | if ($request->query->has($form->getName())) { | 205 | if ($request->query->has($form->getName())) { |
207 | // manually bind values from the request | 206 | // manually bind values from the request |