uidaho / smartsettia

app/Http/Controllers/DeviceController.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
      *
      * @param  Request  $request
      * @param  string  $id
-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request, $id)
     {
@@ -145,7 +145,7 @@ 
      *
      * @param  Request  $request
      * @param  string  $id
-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Request $request, $id)
     {

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
     {
         $device = Device::findOrFail($id);
 
-        return view('device.show', ['device' => $device]);
+        return view('device.show', [ 'device' => $device ]);
     }
 
     /**
@@ -73,7 +73,7 @@ 
         else
             $site = null;
 
-        return view('device.edit', ['device' => $device, 'location' => $location, 'site' => $site]);
+        return view('device.edit', [ 'device' => $device, 'location' => $location, 'site' => $site ]);
     }
 
     /**
@@ -183,7 +183,7 @@ 
     {
         $device = Device::findOrFail($id);
         
-        return view('device.remove', ['device' => $device]);
+        return view('device.remove', [ 'device' => $device ]);
     }
     
     /**

Braces +6 added lines, -6 removed lines

@@ -68,10 +68,11 @@ 
     {
         $device = Device::findOrFail($id);
         $location = Location::where('id', $device->location_id)->first();
-        if ($location)
-            $site = Site::where('id', $location->site_id)->first();
-        else
-            $site = null;
+        if ($location) {
+                    $site = Site::where('id', $location->site_id)->first();
+        } else {
+                    $site = null;
+        }
 
         return view('device.edit', ['device' => $device, 'location' => $location, 'site' => $site]);
     }
@@ -155,8 +156,7 @@ 
         {
             // if the user was already deleted then permananetly delete it
             Device::destroy($id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $oldLocation_id = $device->location_id;

app/DataTables/DevicesDataTable.php

Spacing +5 added lines, -5 removed lines

@@ -17,8 +17,8 @@ 
         return $this->datatables
             ->eloquent($this->query())
             ->addColumn('action', 'device.action')
-            ->blacklist(['action'])
-            ->setRowClass(function ($device) {
+            ->blacklist([ 'action' ])
+            ->setRowClass(function($device) {
                 return $device->trashed() ? 'alert-danger' : "";
             });
     }
@@ -57,7 +57,7 @@ 
                     //->addAction(['width' => '160px'])
                     ->parameters([
                         'dom'     => 'Bfrtip',
-                        'order'   => [[0, 'asc']],
+                        'order'   => [ [ 0, 'asc' ] ],
                         'buttons' => [
                             'export',
                             'print',
@@ -83,7 +83,7 @@ 
             'name',
             'location',
             'site',
-            ['name' => 'action', 'data' => 'action', 'title' => 'Actions', 'render' => null, 'searchable' => false, 'orderable' => false, 'exportable' => false, 'printable' => true, 'footer' => ''],
+            [ 'name' => 'action', 'data' => 'action', 'title' => 'Actions', 'render' => null, 'searchable' => false, 'orderable' => false, 'exportable' => false, 'printable' => true, 'footer' => '' ],
         ];
     }
 
@@ -94,6 +94,6 @@ 
      */
     protected function filename()
     {
-        return 'devices_' . time();
+        return 'devices_'.time();
     }
 }