mirror of https://github.com/wallabag/wallabag.git
Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too.
This commit is contained in:
Jeremy Benoist
Thomas Citharel
parent
f06f840c9d
commit
6334f2cac1
|
|
@ -23,10 +23,16 @@ class EntryController extends Controller
|
|||
{
|
||||
try {
|
||||
$entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
|
||||
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
$em->persist($entry);
|
||||
$em->flush();
|
||||
} catch (\Exception $e) {
|
||||
$this->get('logger')->error('Error while saving an entry', [
|
||||
'exception' => $e,
|
||||
'entry' => $entry,
|
||||
]);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -60,11 +66,12 @@ class EntryController extends Controller
|
|||
return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()]));
|
||||
}
|
||||
|
||||
$this->updateEntry($entry);
|
||||
$this->get('session')->getFlashBag()->add(
|
||||
'notice',
|
||||
'flashes.entry.notice.entry_saved'
|
||||
);
|
||||
$message = 'flashes.entry.notice.entry_saved';
|
||||
if (false === $this->updateEntry($entry)) {
|
||||
$message = 'flashes.entry.notice.entry_saved_failed';
|
||||
}
|
||||
|
||||
$this->get('session')->getFlashBag()->add('notice', $message);
|
||||
|
||||
return $this->redirect($this->generateUrl('homepage'));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
# entry_already_saved: 'Entry already saved on %date%'
|
||||
# entry_saved: 'Entry saved'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
# entry_updated: 'Entry updated'
|
||||
# entry_reloaded: 'Entry reloaded'
|
||||
# entry_reload_failed: 'Failed to reload entry'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Eintrag bereits am %date% gespeichert'
|
||||
entry_saved: 'Eintag gespeichert'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'Eintrag aktualisiert'
|
||||
entry_reloaded: 'Eintrag neugeladen'
|
||||
entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Entry already saved on %date%'
|
||||
entry_saved: 'Entry saved'
|
||||
entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'Entry updated'
|
||||
entry_reloaded: 'Entry reloaded'
|
||||
entry_reload_failed: 'Failed to reload entry'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Entrada ya guardada por %fecha%'
|
||||
entry_saved: 'Entrada guardada'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'Entrada actualizada'
|
||||
entry_reloaded: 'Entrada recargada'
|
||||
entry_reload_failed: 'Entrada recargada reprobada'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
|
||||
entry_saved: 'مقاله ذخیره شد'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'مقاله بهروز شد'
|
||||
entry_reloaded: 'مقاله بهروز شد'
|
||||
entry_reload_failed: 'بهروزرسانی مقاله شکست خورد'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Article déjà sauvergardé le %date%'
|
||||
entry_saved: 'Article enregistré'
|
||||
entry_saved_failed: "L'enregistrement a échoué"
|
||||
entry_updated: 'Article mis à jour'
|
||||
entry_reloaded: 'Article rechargé'
|
||||
entry_reload_failed: "Le rechargement de l'article a échoué"
|
||||
|
|
|
|||
|
|
@ -396,6 +396,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Contenuto già salvato in data %date%'
|
||||
entry_saved: 'Contenuto salvato'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'Contenuto aggiornato'
|
||||
entry_reloaded: 'Contenuto ricaricato'
|
||||
entry_reload_failed: 'Errore nel ricaricamento del contenuto'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Article ja salvargardat lo %date%'
|
||||
entry_saved: 'Article enregistrat'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'Article mes a jorn'
|
||||
entry_reloaded: 'Article recargat'
|
||||
entry_reload_failed: "Fracàs de l'actualizacion de l'article"
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Wpis już został dodany %date%'
|
||||
entry_saved: 'Wpis zapisany'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
entry_updated: 'Wpis zaktualizowany'
|
||||
entry_reloaded: 'Wpis ponownie załadowany'
|
||||
entry_reload_failed: 'Błąd ponownego załadowania'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
# entry_already_saved: 'Entry already saved on %date%'
|
||||
# entry_saved: 'Entry saved'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
# entry_updated: 'Entry updated'
|
||||
# entry_reloaded: 'Entry reloaded'
|
||||
# entry_reload_failed: 'Failed to reload entry'
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ flashes:
|
|||
notice:
|
||||
entry_already_saved: 'Entry already saved on %date%'
|
||||
entry_saved: 'Makale kaydedildi'
|
||||
# entry_saved_failed: 'Failed to save entry'
|
||||
# entry_updated: 'Entry updated'
|
||||
entry_reloaded: 'Makale içeriği yenilendi'
|
||||
# entry_reload_failed: 'Failed to reload entry'
|
||||
|
|
|
|||
Loading…
Reference in New Issue