View GitHub Repository librenmsv2

Schedule Inspection
Subscribe
Completed
Pull Request — develop (#38)
by Neil
06:20
created
Status
Category
Toggle Patches
app/Api/Controllers/NotificationController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -27,11 +27,11 @@
 
 block discarded – undo
27 27 
         if ($type === 'archive')
28 28 
         {
29 29 
             //$notifications = Notification::read([$request->user()->user_id])->limit()->get();
30 
-            $notifications = Notification::select('notifications.*','key')->leftJoin('notifications_attribs', 'notifications.notifications_id', '=', 'notifications_attribs.notifications_id')->where('user_id', $user_id)->where(['key'=>'read', 'value'=> 1]);
30 
+            $notifications = Notification::select('notifications.*', 'key')->leftJoin('notifications_attribs', 'notifications.notifications_id', '=', 'notifications_attribs.notifications_id')->where('user_id', $user_id)->where(['key'=>'read', 'value'=> 1]);
31 31 
         }
32 32 
         else {
33 33 
             //$notifications = Notification::unread()->limit()->get();
34 
-            $notifications = Notification::select('notifications.*','key')->leftJoin('notifications_attribs', 'notifications.notifications_id', '=', 'notifications_attribs.notifications_id')->whereNull('user_id')->orWhere(['key'=>'sticky', 'value'=> 1])->get();
34 
+            $notifications = Notification::select('notifications.*', 'key')->leftJoin('notifications_attribs', 'notifications.notifications_id', '=', 'notifications_attribs.notifications_id')->whereNull('user_id')->orWhere(['key'=>'sticky', 'value'=> 1])->get();
35 35 
         }
36 36
37 37 
         if ($request->query('displayFormat') == 'human') {
Please login to merge, or discard this patch.