diff options
author | lizyn <zhiylin@outlook.com> | 2020-02-24 10:04:13 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-24 10:04:13 +0800 |
commit | b19df31d78d881a43bcf6b3215e5fc3781e8e8aa (patch) | |
tree | d0d9861694a4b5e5fbfdbeb53c255ecd15fe9328 /src/Wallabag/CoreBundle/Controller/ExportController.php | |
parent | 4d0c632c70ea50d459c3c55ddda2e0f394dd51cb (diff) | |
parent | 04d918cae0227c06a41d27fb6533dddbf30dfe71 (diff) | |
download | wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.gz wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.zst wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.zip |
Merge pull request #1 from wallabag/master
Keep up with the master again
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ExportController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ExportController.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Wallabag/CoreBundle/Controller/ExportController.php index 7ca89239..282fd733 100644 --- a/src/Wallabag/CoreBundle/Controller/ExportController.php +++ b/src/Wallabag/CoreBundle/Controller/ExportController.php | |||
@@ -2,10 +2,10 @@ | |||
2 | 2 | ||
3 | namespace Wallabag\CoreBundle\Controller; | 3 | namespace Wallabag\CoreBundle\Controller; |
4 | 4 | ||
5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | ||
6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
7 | use Symfony\Component\HttpFoundation\Request; | 6 | use Symfony\Component\HttpFoundation\Request; |
8 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; | 7 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
8 | use Symfony\Component\Routing\Annotation\Route; | ||
9 | use Wallabag\CoreBundle\Entity\Entry; | 9 | use Wallabag\CoreBundle\Entity\Entry; |
10 | 10 | ||
11 | /** | 11 | /** |
@@ -17,7 +17,6 @@ class ExportController extends Controller | |||
17 | /** | 17 | /** |
18 | * Gets one entry content. | 18 | * Gets one entry content. |
19 | * | 19 | * |
20 | * @param Entry $entry | ||
21 | * @param string $format | 20 | * @param string $format |
22 | * | 21 | * |
23 | * @Route("/export/{id}.{format}", name="export_entry", requirements={ | 22 | * @Route("/export/{id}.{format}", name="export_entry", requirements={ |
@@ -58,6 +57,7 @@ class ExportController extends Controller | |||
58 | $method = ucfirst($category); | 57 | $method = ucfirst($category); |
59 | $methodBuilder = 'getBuilderFor' . $method . 'ByUser'; | 58 | $methodBuilder = 'getBuilderFor' . $method . 'ByUser'; |
60 | $repository = $this->get('wallabag_core.entry_repository'); | 59 | $repository = $this->get('wallabag_core.entry_repository'); |
60 | $title = $method; | ||
61 | 61 | ||
62 | if ('tag_entries' === $category) { | 62 | if ('tag_entries' === $category) { |
63 | $tag = $this->get('wallabag_core.tag_repository')->findOneBySlug($request->query->get('tag')); | 63 | $tag = $this->get('wallabag_core.tag_repository')->findOneBySlug($request->query->get('tag')); |
@@ -66,6 +66,8 @@ class ExportController extends Controller | |||
66 | $this->getUser()->getId(), | 66 | $this->getUser()->getId(), |
67 | $tag->getId() | 67 | $tag->getId() |
68 | ); | 68 | ); |
69 | |||
70 | $title = 'Tag ' . $tag->getLabel(); | ||
69 | } else { | 71 | } else { |
70 | $entries = $repository | 72 | $entries = $repository |
71 | ->$methodBuilder($this->getUser()->getId()) | 73 | ->$methodBuilder($this->getUser()->getId()) |
@@ -76,7 +78,7 @@ class ExportController extends Controller | |||
76 | try { | 78 | try { |
77 | return $this->get('wallabag_core.helper.entries_export') | 79 | return $this->get('wallabag_core.helper.entries_export') |
78 | ->setEntries($entries) | 80 | ->setEntries($entries) |
79 | ->updateTitle($method) | 81 | ->updateTitle($title) |
80 | ->updateAuthor($method) | 82 | ->updateAuthor($method) |
81 | ->exportAs($format); | 83 | ->exportAs($format); |
82 | } catch (\InvalidArgumentException $e) { | 84 | } catch (\InvalidArgumentException $e) { |