pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add flashes messages

Browse Source
This commit is contained in:
Jeremy Benoist
2016-03-11 14:48:46 +01:00
parent 4f9cf232f8
commit 4204a06b77
11 changed files with 94 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Wallabag/CoreBundle/Controller/ConfigController.php
View File

@ -45,7 +45,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Config saved. Some parameters will be considered after disconnection.'
'flashes.config.notice.config_saved'
);
return $this->redirect($this->generateUrl('config'));
@ -57,9 +57,9 @@ class ConfigController extends Controller
if ($pwdForm->isValid()) {
if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
$message = 'In demonstration mode, you can\'t change password for this user.';
$message = 'flashes.config.notice.password_not_updated_demo';
} else {
$message = 'Password updated';
$message = 'flashes.config.notice.password_updated';
$user->setPlainPassword($pwdForm->get('new_password')->getData());
$userManager->updateUser($user, true);
@ -82,7 +82,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Information updated'
'flashes.config.notice.user_updated'
);
return $this->redirect($this->generateUrl('config').'#set3');
@ -98,7 +98,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'RSS information updated'
'flashes.config.notice.rss_updated'
);
return $this->redirect($this->generateUrl('config').'#set2');
@ -116,7 +116,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Tagging rules updated'
'flashes.config.notice.tagging_rules_updated'
);
return $this->redirect($this->generateUrl('config').'#set5');
@ -147,7 +147,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
$this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername()))
$this->get('translator')->trans('flashes.config.notice.user_added', array('%username%' => $newUser->getUsername()))
);
return $this->redirect($this->generateUrl('config').'#set6');
@ -192,7 +192,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'RSS token updated'
'flashes.config.notice.rss_token_updated'
);
return $this->redirect($this->generateUrl('config').'#set2');
@ -219,7 +219,7 @@ class ConfigController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Tagging rule deleted'
'flashes.config.notice.tagging_rules_deleted'
);
return $this->redirect($this->generateUrl('config').'#set5');

26
src/Wallabag/CoreBundle/Controller/EntryController.php
View File

@ -55,7 +55,7 @@ class EntryController extends Controller
if (false !== $existingEntry) {
$this->get('session')->getFlashBag()->add(
'notice',
'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y')
$this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')))
);
return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId())));
@ -64,7 +64,7 @@ class EntryController extends Controller
$this->updateEntry($entry);
$this->get('session')->getFlashBag()->add(
'notice',
'Entry saved'
'flashes.entry.notice.entry_saved'
);
return $this->redirect($this->generateUrl('homepage'));
@ -128,7 +128,7 @@ class EntryController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Entry updated'
'flashes.entry.notice.entry_updated'
);
return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
@ -304,9 +304,9 @@ class EntryController extends Controller
{
$this->checkUserAction($entry);
$message = 'Entry reloaded';
$message = 'flashes.entry.notice.entry_reloaded';
if (false === $this->updateEntry($entry)) {
$message = 'Failed to reload entry';
$message = 'flashes.entry.notice.entry_reload_failed';
}
$this->get('session')->getFlashBag()->add(
@ -334,9 +334,14 @@ class EntryController extends Controller
$entry->toggleArchive();
$this->getDoctrine()->getManager()->flush();
$message = 'flashes.entry.notice.entry_unarchived';
if ($entry->isArchived()) {
$message = 'flashes.entry.notice.entry_archived';
}
$this->get('session')->getFlashBag()->add(
'notice',
'Entry '.($entry->isArchived() ? 'archived' : 'unarchived')
$message
);
return $this->redirect($request->headers->get('referer'));
@ -359,9 +364,14 @@ class EntryController extends Controller
$entry->toggleStar();
$this->getDoctrine()->getManager()->flush();
$message = 'flashes.entry.notice.entry_unstarred';
if ($entry->isStarred()) {
$message = 'flashes.entry.notice.entry_starred';
}
$this->get('session')->getFlashBag()->add(
'notice',
'Entry '.($entry->isStarred() ? 'starred' : 'unstarred')
$message
);
return $this->redirect($request->headers->get('referer'));
@ -394,7 +404,7 @@ class EntryController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Entry deleted'
'flashes.entry.notice.entry_deleted'
);
// don't redirect user to the deleted entry

2
src/Wallabag/CoreBundle/Controller/TagController.php
View File

@ -43,7 +43,7 @@ class TagController extends Controller
$this->get('session')->getFlashBag()->add(
'notice',
'Tag added'
'flashes.tag.notice.tag_added'
);
return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));