uidaho / smartsettia

app/Http/Controllers/DeviceController.php

Braces +16 added lines, -16 removed lines

@@ -84,8 +84,7 @@ 
             $sites->prepend($location->site);
             //Add the current location to the front of the collection of locations
             $locations->prepend($location);
-        }
-        else
+        } else
         {
             //Set locations to null since there is no site or location attached to the selected device
             $locations = null;
@@ -93,10 +92,11 @@ 
             $sites = Site::all();
         }
         
-        if (\Request::ajax())
-            return response()->json([ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
-        else
-            return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        if (\Request::ajax()) {
+                    return response()->json([ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        } else {
+                    return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        }
     }
     
     /**
@@ -110,8 +110,9 @@ 
     {
         $locations = Location::bySite($site_id)->select('id', 'name', 'site_id')->get();
         
-        if ($locations->isEmpty())
-            $locations = null;
+        if ($locations->isEmpty()) {
+                    $locations = null;
+        }
     
         return response()->json($locations);
     }
@@ -151,8 +152,7 @@ 
             //Create a new site
             $siteName = $request->input('new_site_name');
             $site_id = Site::createSite($siteName)->id;
-        }
-        else
+        } else
         {
             $site_id = $request->input('site');
         }
@@ -166,8 +166,7 @@ 
             //Create a new location
             $locationName = $request->input('new_location_name');
             $location_id = Location::createLocation($locationName, $site_id)->id;
-        }
-        else
+        } else
         {
             $location_id = $request->input('location');
         }
@@ -188,10 +187,11 @@ 
         //Remove any unused sites or locations
         $this->RemoveUnusedSiteLoc();
     
-        if (\Request::ajax())
-            return response()->json("Success");
-        else
-            return redirect('device');
+        if (\Request::ajax()) {
+                    return response()->json("Success");
+        } else {
+                    return redirect('device');
+        }
     }
 
     /**