diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index b7799746..6eb621d8 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller; | |||
5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
7 | use Symfony\Component\HttpFoundation\JsonResponse; | 7 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | use Symfony\Component\HttpFoundation\RedirectResponse; | ||
8 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
9 | use Wallabag\CoreBundle\Entity\Config; | 10 | use Wallabag\CoreBundle\Entity\Config; |
10 | use Wallabag\CoreBundle\Entity\TaggingRule; | 11 | use Wallabag\CoreBundle\Entity\TaggingRule; |
@@ -64,7 +65,7 @@ class ConfigController extends Controller | |||
64 | 'Password updated' | 65 | 'Password updated' |
65 | ); | 66 | ); |
66 | 67 | ||
67 | return $this->redirect($this->generateUrl('config')); | 68 | return $this->redirect($this->generateUrl('config').'#set4'); |
68 | } | 69 | } |
69 | 70 | ||
70 | // handle changing user information | 71 | // handle changing user information |
@@ -82,7 +83,7 @@ class ConfigController extends Controller | |||
82 | 'Information updated' | 83 | 'Information updated' |
83 | ); | 84 | ); |
84 | 85 | ||
85 | return $this->redirect($this->generateUrl('config')); | 86 | return $this->redirect($this->generateUrl('config').'#set3'); |
86 | } | 87 | } |
87 | 88 | ||
88 | // handle rss information | 89 | // handle rss information |
@@ -98,7 +99,7 @@ class ConfigController extends Controller | |||
98 | 'RSS information updated' | 99 | 'RSS information updated' |
99 | ); | 100 | ); |
100 | 101 | ||
101 | return $this->redirect($this->generateUrl('config')); | 102 | return $this->redirect($this->generateUrl('config').'#set2'); |
102 | } | 103 | } |
103 | 104 | ||
104 | // handle tagging rule | 105 | // handle tagging rule |
@@ -116,7 +117,7 @@ class ConfigController extends Controller | |||
116 | 'Tagging rules updated' | 117 | 'Tagging rules updated' |
117 | ); | 118 | ); |
118 | 119 | ||
119 | return $this->redirect($this->generateUrl('config')); | 120 | return $this->redirect($this->generateUrl('config').'#set5'); |
120 | } | 121 | } |
121 | 122 | ||
122 | // handle adding new user | 123 | // handle adding new user |
@@ -144,10 +145,10 @@ class ConfigController extends Controller | |||
144 | 145 | ||
145 | $this->get('session')->getFlashBag()->add( | 146 | $this->get('session')->getFlashBag()->add( |
146 | 'notice', | 147 | 'notice', |
147 | sprintf('User "%s" added', $newUser->getUsername()) | 148 | $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername())) |
148 | ); | 149 | ); |
149 | 150 | ||
150 | return $this->redirect($this->generateUrl('config')); | 151 | return $this->redirect($this->generateUrl('config').'#set6'); |
151 | } | 152 | } |
152 | 153 | ||
153 | return $this->render('WallabagCoreBundle:Config:index.html.twig', array( | 154 | return $this->render('WallabagCoreBundle:Config:index.html.twig', array( |
@@ -172,7 +173,7 @@ class ConfigController extends Controller | |||
172 | * | 173 | * |
173 | * @Route("/generate-token", name="generate_token") | 174 | * @Route("/generate-token", name="generate_token") |
174 | * | 175 | * |
175 | * @return JsonResponse | 176 | * @return RedirectResponse|JsonResponse |
176 | */ | 177 | */ |
177 | public function generateTokenAction(Request $request) | 178 | public function generateTokenAction(Request $request) |
178 | { | 179 | { |
@@ -187,7 +188,12 @@ class ConfigController extends Controller | |||
187 | return new JsonResponse(array('token' => $config->getRssToken())); | 188 | return new JsonResponse(array('token' => $config->getRssToken())); |
188 | } | 189 | } |
189 | 190 | ||
190 | return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config'); | 191 | $this->get('session')->getFlashBag()->add( |
192 | 'notice', | ||
193 | 'RSS token updated' | ||
194 | ); | ||
195 | |||
196 | return $this->redirect($this->generateUrl('config').'#set2'); | ||
191 | } | 197 | } |
192 | 198 | ||
193 | /** | 199 | /** |
@@ -197,7 +203,7 @@ class ConfigController extends Controller | |||
197 | * | 203 | * |
198 | * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") | 204 | * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") |
199 | * | 205 | * |
200 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 206 | * @return RedirectResponse |
201 | */ | 207 | */ |
202 | public function deleteTaggingRuleAction(TaggingRule $rule) | 208 | public function deleteTaggingRuleAction(TaggingRule $rule) |
203 | { | 209 | { |
@@ -214,7 +220,7 @@ class ConfigController extends Controller | |||
214 | 'Tagging rule deleted' | 220 | 'Tagging rule deleted' |
215 | ); | 221 | ); |
216 | 222 | ||
217 | return $this->redirect($this->generateUrl('config')); | 223 | return $this->redirect($this->generateUrl('config').'#set5'); |
218 | } | 224 | } |
219 | 225 | ||
220 | /** | 226 | /** |