Completed
Pull Request — master (#78)
by Brandon
02:05
created
app/DataTables/DevicesDataTable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     {
18 18
         return datatables($query)
19 19
             ->addColumn('action', 'device.action')
20
-            ->blacklist([ 'action'])
20
+            ->blacklist([ 'action' ])
21 21
             ->setRowClass(function($device) {
22 22
                 return $device->trashed() ? 'alert-danger' : "";
23 23
             });
Please login to merge, or discard this patch.
app/Location.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
      *
25 25
      * @var array
26 26
      */
27
-    protected static $ignoreChangedAttributes = ['updated_at'];
27
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
28 28
     
29 29
     /**
30 30
      * The attributes to log in the Activity Log
Please login to merge, or discard this patch.
app/Deviceimage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
      *
25 25
      * @var array
26 26
      */
27
-    protected static $ignoreChangedAttributes = ['updated_at'];
27
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
28 28
     
29 29
     /**
30 30
      * The attributes to log in the Activity Log
Please login to merge, or discard this patch.
app/DataTables/ActivityLogDataTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
     public function dataTable($query)
17 17
     {
18 18
         return datatables($query)
19
-            ->editColumn('causer_id', function ($activity) {
20
-                return ($activity->causer_id ? '<a href="/' . ($activity->causer_type == "App\User" ? 'user' : 'device') . '/' . $activity->causer_id . '">' . (is_object($activity->causer) ? $activity->causer->name : '') . '</a>' : 'App');
19
+            ->editColumn('causer_id', function($activity) {
20
+                return ($activity->causer_id ? '<a href="/'.($activity->causer_type == "App\User" ? 'user' : 'device').'/'.$activity->causer_id.'">'.(is_object($activity->causer) ? $activity->causer->name : '').'</a>' : 'App');
21 21
             })
22
-            ->editColumn('subject_id', function ($activity) {
23
-                return ($activity->subject_id ? '<a href="/' . ($activity->subject_type == "App\User" ? 'user' : 'device') . '/' . $activity->subject_id . '">' . (is_object($activity->subject) ? $activity->subject->name : '') . '</a>' : 'App');
22
+            ->editColumn('subject_id', function($activity) {
23
+                return ($activity->subject_id ? '<a href="/'.($activity->subject_type == "App\User" ? 'user' : 'device').'/'.$activity->subject_id.'">'.(is_object($activity->subject) ? $activity->subject->name : '').'</a>' : 'App');
24 24
             })
25
-            ->editColumn('properties', function ($activity) {
25
+            ->editColumn('properties', function($activity) {
26 26
                 return $activity->properties;
27 27
             })
28
-            ->rawColumns(['causer_id', 'subject_id', 'properties']);
28
+            ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]);
29 29
     }
30 30
 
31 31
     /**
@@ -98,6 +98,6 @@  discard block
 block discarded – undo
98 98
      */
99 99
     protected function filename()
100 100
     {
101
-        return 'activitylog_' . time();
101
+        return 'activitylog_'.time();
102 102
     }
103 103
 }
Please login to merge, or discard this patch.
app/User.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,6 +143,6 @@
 block discarded – undo
143 143
     public function roleString()
144 144
     {
145 145
         $role_en = array(0 => "Registered", 1 => "User", 2 => "Manager", 3 => "Admin");
146
-        return $role_en[ $this->role ] . ' (' . $this->role . ')';
146
+        return $role_en[ $this->role ].' ('.$this->role.')';
147 147
     }
148 148
 }
Please login to merge, or discard this patch.