kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Better notifications.

Browse Source
This commit is contained in:
James Cole
2015-07-19 13:46:34 +02:00
parent fe807e23f8
commit f93e480466
2 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/TransactionController.php
View File

@@ -272,19 +272,15 @@ class TransactionController extends Controller
// save attachments:
$att->saveAttachmentsForModel($journal);
if ($att->getErrors()->count() > 0) {
// todo moet beter
Session::flash('error', '<ul>' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
// flash errors
if (count($att->getErrors()->get('attachments')) > 0) {
Session::flash('error', $att->getErrors()->get('attachments'));
}
if ($att->getMessages()->count() > 0) {
// todo moet beter
Session::flash('info', '<ul>' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
// flash messages
if (count($att->getMessages()->get('attachments')) > 0) {
Session::flash('info', $att->getMessages()->get('attachments'));
}
// do something with the messages?
// rescan journal, UpdateJournalConnection
event(new JournalSaved($journal));
@@ -325,13 +321,20 @@ class TransactionController extends Controller
// save attachments:
$att->saveAttachmentsForModel($journal);
if ($att->getErrors()->count() > 0) {
// todo moet beter
Session::flash('error', '<ul>' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
// one error
if ($att->getErrors()->count() == 1) {
Session::flash('error', join('', $att->getErrors()->get('attachments')));
}
if ($att->getErrors()->count() > 1) {
// todo moet beter
Session::flash('error', '<ul class="list-unstyled">' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
}
if ($att->getMessages()->count() > 0) {
// todo moet beter
Session::flash('info', '<ul>' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
Session::flash('info', '<ul class="list-unstyled">' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
}
event(new JournalSaved($journal));