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)
     {

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;