diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
4 files changed, 38 insertions, 38 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 1930a2ae..779be268 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -45,7 +45,7 @@ class ConfigController extends Controller | |||
45 | 45 | ||
46 | $this->get('session')->getFlashBag()->add( | 46 | $this->get('session')->getFlashBag()->add( |
47 | 'notice', | 47 | 'notice', |
48 | 'Config saved. Some parameters will be considered after disconnection.' | 48 | 'flashes.config.notice.config_saved' |
49 | ); | 49 | ); |
50 | 50 | ||
51 | return $this->redirect($this->generateUrl('config')); | 51 | return $this->redirect($this->generateUrl('config')); |
@@ -57,9 +57,9 @@ class ConfigController extends Controller | |||
57 | 57 | ||
58 | if ($pwdForm->isValid()) { | 58 | if ($pwdForm->isValid()) { |
59 | if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) { | 59 | if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) { |
60 | $message = 'In demonstration mode, you can\'t change password for this user.'; | 60 | $message = 'flashes.config.notice.password_not_updated_demo'; |
61 | } else { | 61 | } else { |
62 | $message = 'Password updated'; | 62 | $message = 'flashes.config.notice.password_updated'; |
63 | 63 | ||
64 | $user->setPlainPassword($pwdForm->get('new_password')->getData()); | 64 | $user->setPlainPassword($pwdForm->get('new_password')->getData()); |
65 | $userManager->updateUser($user, true); | 65 | $userManager->updateUser($user, true); |
@@ -82,7 +82,7 @@ class ConfigController extends Controller | |||
82 | 82 | ||
83 | $this->get('session')->getFlashBag()->add( | 83 | $this->get('session')->getFlashBag()->add( |
84 | 'notice', | 84 | 'notice', |
85 | 'Information updated' | 85 | 'flashes.config.notice.user_updated' |
86 | ); | 86 | ); |
87 | 87 | ||
88 | return $this->redirect($this->generateUrl('config').'#set3'); | 88 | return $this->redirect($this->generateUrl('config').'#set3'); |
@@ -98,7 +98,7 @@ class ConfigController extends Controller | |||
98 | 98 | ||
99 | $this->get('session')->getFlashBag()->add( | 99 | $this->get('session')->getFlashBag()->add( |
100 | 'notice', | 100 | 'notice', |
101 | 'RSS information updated' | 101 | 'flashes.config.notice.rss_updated' |
102 | ); | 102 | ); |
103 | 103 | ||
104 | return $this->redirect($this->generateUrl('config').'#set2'); | 104 | return $this->redirect($this->generateUrl('config').'#set2'); |
@@ -116,7 +116,7 @@ class ConfigController extends Controller | |||
116 | 116 | ||
117 | $this->get('session')->getFlashBag()->add( | 117 | $this->get('session')->getFlashBag()->add( |
118 | 'notice', | 118 | 'notice', |
119 | 'Tagging rules updated' | 119 | 'flashes.config.notice.tagging_rules_updated' |
120 | ); | 120 | ); |
121 | 121 | ||
122 | return $this->redirect($this->generateUrl('config').'#set5'); | 122 | return $this->redirect($this->generateUrl('config').'#set5'); |
@@ -147,7 +147,7 @@ class ConfigController extends Controller | |||
147 | 147 | ||
148 | $this->get('session')->getFlashBag()->add( | 148 | $this->get('session')->getFlashBag()->add( |
149 | 'notice', | 149 | 'notice', |
150 | $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername())) | 150 | $this->get('translator')->trans('flashes.config.notice.user_added', array('%username%' => $newUser->getUsername())) |
151 | ); | 151 | ); |
152 | 152 | ||
153 | return $this->redirect($this->generateUrl('config').'#set6'); | 153 | return $this->redirect($this->generateUrl('config').'#set6'); |
@@ -192,7 +192,7 @@ class ConfigController extends Controller | |||
192 | 192 | ||
193 | $this->get('session')->getFlashBag()->add( | 193 | $this->get('session')->getFlashBag()->add( |
194 | 'notice', | 194 | 'notice', |
195 | 'RSS token updated' | 195 | 'flashes.config.notice.rss_token_updated' |
196 | ); | 196 | ); |
197 | 197 | ||
198 | return $this->redirect($this->generateUrl('config').'#set2'); | 198 | return $this->redirect($this->generateUrl('config').'#set2'); |
@@ -210,7 +210,7 @@ class ConfigController extends Controller | |||
210 | public function deleteTaggingRuleAction(TaggingRule $rule) | 210 | public function deleteTaggingRuleAction(TaggingRule $rule) |
211 | { | 211 | { |
212 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { | 212 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { |
213 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); | 213 | throw $this->createAccessDeniedException('You can not access this tagging rule.'); |
214 | } | 214 | } |
215 | 215 | ||
216 | $em = $this->getDoctrine()->getManager(); | 216 | $em = $this->getDoctrine()->getManager(); |
@@ -219,7 +219,7 @@ class ConfigController extends Controller | |||
219 | 219 | ||
220 | $this->get('session')->getFlashBag()->add( | 220 | $this->get('session')->getFlashBag()->add( |
221 | 'notice', | 221 | 'notice', |
222 | 'Tagging rule deleted' | 222 | 'flashes.config.notice.tagging_rules_deleted' |
223 | ); | 223 | ); |
224 | 224 | ||
225 | return $this->redirect($this->generateUrl('config').'#set5'); | 225 | return $this->redirect($this->generateUrl('config').'#set5'); |
diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php index e5cfd83c..7cb0ead2 100644 --- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php +++ b/src/Wallabag/CoreBundle/Controller/DeveloperController.php | |||
@@ -49,7 +49,7 @@ class DeveloperController extends Controller | |||
49 | 49 | ||
50 | $this->get('session')->getFlashBag()->add( | 50 | $this->get('session')->getFlashBag()->add( |
51 | 'notice', | 51 | 'notice', |
52 | 'New client created.' | 52 | 'flashes.developer.notice.client_created' |
53 | ); | 53 | ); |
54 | 54 | ||
55 | return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', array( | 55 | return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', array( |
@@ -80,7 +80,7 @@ class DeveloperController extends Controller | |||
80 | 80 | ||
81 | $this->get('session')->getFlashBag()->add( | 81 | $this->get('session')->getFlashBag()->add( |
82 | 'notice', | 82 | 'notice', |
83 | 'Client deleted' | 83 | 'flashes.developer.notice.client_deleted' |
84 | ); | 84 | ); |
85 | 85 | ||
86 | return $this->redirect($this->generateUrl('developer')); | 86 | return $this->redirect($this->generateUrl('developer')); |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 0fae3a0f..fa633031 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -55,7 +55,7 @@ class EntryController extends Controller | |||
55 | if (false !== $existingEntry) { | 55 | if (false !== $existingEntry) { |
56 | $this->get('session')->getFlashBag()->add( | 56 | $this->get('session')->getFlashBag()->add( |
57 | 'notice', | 57 | 'notice', |
58 | 'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y') | 58 | $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y'))) |
59 | ); | 59 | ); |
60 | 60 | ||
61 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); | 61 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); |
@@ -64,7 +64,7 @@ class EntryController extends Controller | |||
64 | $this->updateEntry($entry); | 64 | $this->updateEntry($entry); |
65 | $this->get('session')->getFlashBag()->add( | 65 | $this->get('session')->getFlashBag()->add( |
66 | 'notice', | 66 | 'notice', |
67 | 'Entry saved' | 67 | 'flashes.entry.notice.entry_saved' |
68 | ); | 68 | ); |
69 | 69 | ||
70 | return $this->redirect($this->generateUrl('homepage')); | 70 | return $this->redirect($this->generateUrl('homepage')); |
@@ -92,13 +92,11 @@ class EntryController extends Controller | |||
92 | } | 92 | } |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * @param Request $request | ||
96 | * | ||
97 | * @Route("/new", name="new") | 95 | * @Route("/new", name="new") |
98 | * | 96 | * |
99 | * @return \Symfony\Component\HttpFoundation\Response | 97 | * @return \Symfony\Component\HttpFoundation\Response |
100 | */ | 98 | */ |
101 | public function addEntryAction(Request $request) | 99 | public function addEntryAction() |
102 | { | 100 | { |
103 | return $this->render('WallabagCoreBundle:Entry:new.html.twig'); | 101 | return $this->render('WallabagCoreBundle:Entry:new.html.twig'); |
104 | } | 102 | } |
@@ -128,7 +126,7 @@ class EntryController extends Controller | |||
128 | 126 | ||
129 | $this->get('session')->getFlashBag()->add( | 127 | $this->get('session')->getFlashBag()->add( |
130 | 'notice', | 128 | 'notice', |
131 | 'Entry updated' | 129 | 'flashes.entry.notice.entry_updated' |
132 | ); | 130 | ); |
133 | 131 | ||
134 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); | 132 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); |
@@ -304,9 +302,9 @@ class EntryController extends Controller | |||
304 | { | 302 | { |
305 | $this->checkUserAction($entry); | 303 | $this->checkUserAction($entry); |
306 | 304 | ||
307 | $message = 'Entry reloaded'; | 305 | $message = 'flashes.entry.notice.entry_reloaded'; |
308 | if (false === $this->updateEntry($entry)) { | 306 | if (false === $this->updateEntry($entry)) { |
309 | $message = 'Failed to reload entry'; | 307 | $message = 'flashes.entry.notice.entry_reload_failed'; |
310 | } | 308 | } |
311 | 309 | ||
312 | $this->get('session')->getFlashBag()->add( | 310 | $this->get('session')->getFlashBag()->add( |
@@ -334,9 +332,14 @@ class EntryController extends Controller | |||
334 | $entry->toggleArchive(); | 332 | $entry->toggleArchive(); |
335 | $this->getDoctrine()->getManager()->flush(); | 333 | $this->getDoctrine()->getManager()->flush(); |
336 | 334 | ||
335 | $message = 'flashes.entry.notice.entry_unarchived'; | ||
336 | if ($entry->isArchived()) { | ||
337 | $message = 'flashes.entry.notice.entry_archived'; | ||
338 | } | ||
339 | |||
337 | $this->get('session')->getFlashBag()->add( | 340 | $this->get('session')->getFlashBag()->add( |
338 | 'notice', | 341 | 'notice', |
339 | 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') | 342 | $message |
340 | ); | 343 | ); |
341 | 344 | ||
342 | return $this->redirect($request->headers->get('referer')); | 345 | return $this->redirect($request->headers->get('referer')); |
@@ -359,9 +362,14 @@ class EntryController extends Controller | |||
359 | $entry->toggleStar(); | 362 | $entry->toggleStar(); |
360 | $this->getDoctrine()->getManager()->flush(); | 363 | $this->getDoctrine()->getManager()->flush(); |
361 | 364 | ||
365 | $message = 'flashes.entry.notice.entry_unstarred'; | ||
366 | if ($entry->isStarred()) { | ||
367 | $message = 'flashes.entry.notice.entry_starred'; | ||
368 | } | ||
369 | |||
362 | $this->get('session')->getFlashBag()->add( | 370 | $this->get('session')->getFlashBag()->add( |
363 | 'notice', | 371 | 'notice', |
364 | 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') | 372 | $message |
365 | ); | 373 | ); |
366 | 374 | ||
367 | return $this->redirect($request->headers->get('referer')); | 375 | return $this->redirect($request->headers->get('referer')); |
@@ -394,7 +402,7 @@ class EntryController extends Controller | |||
394 | 402 | ||
395 | $this->get('session')->getFlashBag()->add( | 403 | $this->get('session')->getFlashBag()->add( |
396 | 'notice', | 404 | 'notice', |
397 | 'Entry deleted' | 405 | 'flashes.entry.notice.entry_deleted' |
398 | ); | 406 | ); |
399 | 407 | ||
400 | // don't redirect user to the deleted entry | 408 | // don't redirect user to the deleted entry |
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 7b34939d..1a1f8c3d 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -20,30 +20,22 @@ class TagController extends Controller | |||
20 | */ | 20 | */ |
21 | public function addTagFormAction(Request $request, Entry $entry) | 21 | public function addTagFormAction(Request $request, Entry $entry) |
22 | { | 22 | { |
23 | $tag = new Tag(); | 23 | $form = $this->createForm(NewTagType::class, new Tag()); |
24 | $form = $this->createForm(NewTagType::class, $tag); | ||
25 | $form->handleRequest($request); | 24 | $form->handleRequest($request); |
26 | 25 | ||
27 | if ($form->isValid()) { | 26 | if ($form->isValid()) { |
28 | $existingTag = $this->getDoctrine() | 27 | $this->get('wallabag_core.content_proxy')->assignTagsToEntry( |
29 | ->getRepository('WallabagCoreBundle:Tag') | 28 | $entry, |
30 | ->findOneByLabel($tag->getLabel()); | 29 | $form->get('label')->getData() |
30 | ); | ||
31 | 31 | ||
32 | $em = $this->getDoctrine()->getManager(); | 32 | $em = $this->getDoctrine()->getManager(); |
33 | 33 | $em->persist($entry); | |
34 | if (is_null($existingTag)) { | ||
35 | $entry->addTag($tag); | ||
36 | $em->persist($tag); | ||
37 | } elseif (!$existingTag->hasEntry($entry)) { | ||
38 | $entry->addTag($existingTag); | ||
39 | $em->persist($existingTag); | ||
40 | } | ||
41 | |||
42 | $em->flush(); | 34 | $em->flush(); |
43 | 35 | ||
44 | $this->get('session')->getFlashBag()->add( | 36 | $this->get('session')->getFlashBag()->add( |
45 | 'notice', | 37 | 'notice', |
46 | 'Tag added' | 38 | 'flashes.tag.notice.tag_added' |
47 | ); | 39 | ); |
48 | 40 | ||
49 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); | 41 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); |