Completed
Pull Request — develop (#36)
by
unknown
07:11
created
app/Api/Controllers/DeviceController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Api/Controllers/PortController.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,14 +30,12 @@  discard block
 block discarded – undo
30 30
             $includes = explode(',', Input::get('include'));
31 31
             if (in_array('device', $includes)) {
32 32
                 $ports = Port::with('device')->get();
33
-            }
34
-            else {
33
+            } else {
35 34
                 $ports = Port::all();
36 35
             }
37 36
             return $this->response->collection($ports, new PortTransformer);
38 37
             return $ports;
39
-        }
40
-        else {
38
+        } else {
41 39
             return Auth::user()->ports()->get();
42 40
         }
43 41
     }
@@ -73,8 +71,7 @@  discard block
 block discarded – undo
73 71
     {
74 72
         if ($request->user()->hasGlobalRead()) {
75 73
             return Port::find($id);
76
-        }
77
-        else {
74
+        } else {
78 75
             $user = User::find($request->user()->user_id);
79 76
             return $user->ports()->find($id);
80 77
         }
Please login to merge, or discard this patch.