diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 8 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ExportController.php | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 2c4b5536..13b23b61 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -240,13 +240,13 @@ class EntryController extends Controller | |||
240 | * | 240 | * |
241 | * @param int $page | 241 | * @param int $page |
242 | * | 242 | * |
243 | * @Route("/with_annotations/list/{page}", name="with_annotations", defaults={"page" = "1"}) | 243 | * @Route("/annotated/list/{page}", name="annotated", defaults={"page" = "1"}) |
244 | * | 244 | * |
245 | * @return \Symfony\Component\HttpFoundation\Response | 245 | * @return \Symfony\Component\HttpFoundation\Response |
246 | */ | 246 | */ |
247 | public function showWithAnnotationsEntriesAction(Request $request, $page) | 247 | public function showWithAnnotationsEntriesAction(Request $request, $page) |
248 | { | 248 | { |
249 | return $this->showEntries('with_annotations', $request, $page); | 249 | return $this->showEntries('annotated', $request, $page); |
250 | } | 250 | } |
251 | 251 | ||
252 | /** | 252 | /** |
@@ -254,7 +254,7 @@ class EntryController extends Controller | |||
254 | * | 254 | * |
255 | * @param string $type | 255 | * @param string $type |
256 | * | 256 | * |
257 | * @Route("/{type}/random", name="random_entry", requirements={"type": "unread|starred|archive|untagged|with_annotations|all"}) | 257 | * @Route("/{type}/random", name="random_entry", requirements={"type": "unread|starred|archive|untagged|annotated|all"}) |
258 | * | 258 | * |
259 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 259 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
260 | */ | 260 | */ |
@@ -517,7 +517,7 @@ class EntryController extends Controller | |||
517 | case 'archive': | 517 | case 'archive': |
518 | $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId()); | 518 | $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId()); |
519 | break; | 519 | break; |
520 | case 'with_annotations': | 520 | case 'annotated': |
521 | $qb = $repository->getBuilderForAnnotationsByUser($this->getUser()->getId()); | 521 | $qb = $repository->getBuilderForAnnotationsByUser($this->getUser()->getId()); |
522 | break; | 522 | break; |
523 | case 'unread': | 523 | case 'unread': |
diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Wallabag/CoreBundle/Controller/ExportController.php index 8517e7a9..55b94f0a 100644 --- a/src/Wallabag/CoreBundle/Controller/ExportController.php +++ b/src/Wallabag/CoreBundle/Controller/ExportController.php | |||
@@ -47,7 +47,7 @@ class ExportController extends Controller | |||
47 | * | 47 | * |
48 | * @Route("/export/{category}.{format}", name="export_entries", requirements={ | 48 | * @Route("/export/{category}.{format}", name="export_entries", requirements={ |
49 | * "format": "epub|mobi|pdf|json|xml|txt|csv", | 49 | * "format": "epub|mobi|pdf|json|xml|txt|csv", |
50 | * "category": "all|unread|starred|archive|tag_entries|untagged|search|with_annotations" | 50 | * "category": "all|unread|starred|archive|tag_entries|untagged|search|annotated" |
51 | * }) | 51 | * }) |
52 | * | 52 | * |
53 | * @return \Symfony\Component\HttpFoundation\Response | 53 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -80,7 +80,7 @@ class ExportController extends Controller | |||
80 | ->getResult(); | 80 | ->getResult(); |
81 | 81 | ||
82 | $title = 'Search ' . $searchTerm; | 82 | $title = 'Search ' . $searchTerm; |
83 | } elseif ('with_annotations' === $category) { | 83 | } elseif ('annotated' === $category) { |
84 | $entries = $repository->getBuilderForAnnotationsByUser( | 84 | $entries = $repository->getBuilderForAnnotationsByUser( |
85 | $this->getUser()->getId() | 85 | $this->getUser()->getId() |
86 | )->getQuery() | 86 | )->getQuery() |