aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-02-12 12:00:26 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-02-12 12:00:26 +0100
commitc7a4f74f9fe225275c8c2e68269b1f86cc31da6e (patch)
tree81fd50e2a971883267bb84c1584d94ac4ffa9b8d
parent43e4a806bd6714a2b90135e6f5132bc6d11d5194 (diff)
downloadwallabag-c7a4f74f9fe225275c8c2e68269b1f86cc31da6e.tar.gz
wallabag-c7a4f74f9fe225275c8c2e68269b1f86cc31da6e.tar.zst
wallabag-c7a4f74f9fe225275c8c2e68269b1f86cc31da6e.zip
Redirect to the right tab on /config
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php19
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
2 files changed, 13 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index b7799746..5ccf5a56 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -64,7 +64,7 @@ class ConfigController extends Controller
64 'Password updated' 64 'Password updated'
65 ); 65 );
66 66
67 return $this->redirect($this->generateUrl('config')); 67 return $this->redirect($this->generateUrl('config').'#set4');
68 } 68 }
69 69
70 // handle changing user information 70 // handle changing user information
@@ -82,7 +82,7 @@ class ConfigController extends Controller
82 'Information updated' 82 'Information updated'
83 ); 83 );
84 84
85 return $this->redirect($this->generateUrl('config')); 85 return $this->redirect($this->generateUrl('config').'#set3');
86 } 86 }
87 87
88 // handle rss information 88 // handle rss information
@@ -98,7 +98,7 @@ class ConfigController extends Controller
98 'RSS information updated' 98 'RSS information updated'
99 ); 99 );
100 100
101 return $this->redirect($this->generateUrl('config')); 101 return $this->redirect($this->generateUrl('config').'#set2');
102 } 102 }
103 103
104 // handle tagging rule 104 // handle tagging rule
@@ -116,7 +116,7 @@ class ConfigController extends Controller
116 'Tagging rules updated' 116 'Tagging rules updated'
117 ); 117 );
118 118
119 return $this->redirect($this->generateUrl('config')); 119 return $this->redirect($this->generateUrl('config').'#set5');
120 } 120 }
121 121
122 // handle adding new user 122 // handle adding new user
@@ -147,7 +147,7 @@ class ConfigController extends Controller
147 sprintf('User "%s" added', $newUser->getUsername()) 147 sprintf('User "%s" added', $newUser->getUsername())
148 ); 148 );
149 149
150 return $this->redirect($this->generateUrl('config')); 150 return $this->redirect($this->generateUrl('config').'#set6');
151 } 151 }
152 152
153 return $this->render('WallabagCoreBundle:Config:index.html.twig', array( 153 return $this->render('WallabagCoreBundle:Config:index.html.twig', array(
@@ -187,7 +187,12 @@ class ConfigController extends Controller
187 return new JsonResponse(array('token' => $config->getRssToken())); 187 return new JsonResponse(array('token' => $config->getRssToken()));
188 } 188 }
189 189
190 return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config'); 190 $this->get('session')->getFlashBag()->add(
191 'notice',
192 'RSS token updated'
193 );
194
195 return $this->redirect($this->generateUrl('config').'#set2');
191 } 196 }
192 197
193 /** 198 /**
@@ -214,7 +219,7 @@ class ConfigController extends Controller
214 'Tagging rule deleted' 219 'Tagging rule deleted'
215 ); 220 );
216 221
217 return $this->redirect($this->generateUrl('config')); 222 return $this->redirect($this->generateUrl('config').'#set5');
218 } 223 }
219 224
220 /** 225 /**
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index c7186c34..a98b7b7a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -39,6 +39,7 @@ Items per page: "Nombre d'articles par page"
39Language: 'Langue' 39Language: 'Langue'
40Save: 'Enregistrer' 40Save: 'Enregistrer'
41RSS token: 'Jeton RSS' 41RSS token: 'Jeton RSS'
42RSS token updated: 'Jeton RSS mis à jour'
42Name: 'Nom' 43Name: 'Nom'
43Email: 'Adresse e-mail' 44Email: 'Adresse e-mail'
44No token: 'Aucun jeton généré' 45No token: 'Aucun jeton généré'