Merge pull request #10 from mikemand/patch-1

nWidart · web-flow · commit b7da294abe5b · 2018-01-15T21:17:42.000+01:00
Fix exception when marking all as read
diff --git a/Http/Controllers/Admin/NotificationsController.php b/Http/Controllers/Admin/NotificationsController.php
@@ -59,8 +59,7 @@ public function markAllAsRead()
     {
         $this->notification->markAllAsReadForUser($this->auth->id());
 
-        flash(trans('notification::messages.all notifications marked as read'));
-
-        return redirect()->route('admin.notification.notification.index');
+        return redirect()->route('admin.notification.notification.index')
+            ->withSuccess(trans('notification::messages.all notifications marked as read'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ public function markAllAsRead()`
`59`	`59`	`{`
`60`	`60`	`$this->notification->markAllAsReadForUser($this->auth->id());`
`61`	`61`
`62`		`- flash(trans('notification::messages.all notifications marked as read'));`
`63`		`-`
`64`		`- return redirect()->route('admin.notification.notification.index');`
	`62`	`+ return redirect()->route('admin.notification.notification.index')`
	`63`	`+ ->withSuccess(trans('notification::messages.all notifications marked as read'));`
`65`	`64`	`}`
`66`	`65`	`}`