View GitHub Repository smartsettia

Schedule Inspection
Subscribe
Completed
Pull Request — master (#134)
by
unknown
04:52
created
Status
Category
Toggle Patches
app/Http/Controllers/UserController.php 1 patch
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -133,21 +133,24 @@
 
 block discarded – undo
133 133 
             $user->name = $request->input('name');
134 134 
             $user->email = $request->input('email');
135 135 
             $user->phone = $request->input('phone');
136 
-            if ($request->input('password') != '')
137 
-                $user->password = bcrypt($request->input('password'));
138 
-            if (Auth::user()->can('updateRole', $user))
139 
-                $user->role = $request->input('role');
136 
+            if ($request->input('password') != '') {
137 
+                            $user->password = bcrypt($request->input('password'));
138 
+            }
139 
+            if (Auth::user()->can('updateRole', $user)) {
140 
+                            $user->role = $request->input('role');
141 
+            }
142 
+        } else {
143 
+                    $user->preferred_device_id = $request->input('preferred_device_id');
140 144 
         }
141 
-        else
142 
-            $user->preferred_device_id = $request->input('preferred_device_id');
143 145
144 146 
         $user->save();
145 147
146 
-        if (\Request::ajax())
147 
-            return response()->json([ 'success' => 'Preferred device updated successfully' ]);
148 
-        else
149 
-            return redirect()->route('user.show', $user->id)
148 
+        if (\Request::ajax()) {
149 
+                    return response()->json([ 'success' => 'Preferred device updated successfully' ]);
150 
+        } else {
151 
+                    return redirect()->route('user.show', $user->id)
150 152 
                 ->with('success', 'User updated successfully');
153 
+        }
151 154 
     }
152 155
153 156 
     /**
Please login to merge, or discard this patch.
app/Policies/UserPolicy.php 1 patch
Braces   +13 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -51,10 +51,11 @@  discard block
 
 block discarded – undo
51 51 
      */
52 52 
     public function show(User $user, User $user2)
53 53 
     {
54 
-        if ($user->isAdmin())
55 
-            return true;
56 
-        else
57 
-            return $user->id === $user2->id;
54 
+        if ($user->isAdmin()) {
55 
+                    return true;
56 
+        } else {
57 
+                    return $user->id === $user2->id;
58 
+        }
58 59 
     }
59 60
60 61 
     /**
 
@@ -69,9 +70,9 @@  discard block
 
 block discarded – undo
69 70 
         if ($user->role > $user2->role)
70 71 
         {
71 72 
             return $user->isAdmin();
73 
+        } else {
74 
+                    return $user->id === $user2->id;
72 75 
         }
73 
-        else
74 
-            return $user->id === $user2->id;
75 76 
     }
76 77
77 78 
     /**
 
@@ -86,9 +87,9 @@  discard block
 
 block discarded – undo
86 87 
         if ($user->role > $user2->role)
87 88 
         {
88 89 
             return $user->isAdmin();
90 
+        } else {
91 
+                    return $user->id === $user2->id;
89 92 
         }
90 
-        else
91 
-            return $user->id === $user2->id;
92 93 
     }
93 94
94 95 
     /**
 
@@ -103,9 +104,9 @@  discard block
 
 block discarded – undo
103 104 
         if ($user->role > $user2->role)
104 105 
         {
105 106 
             return $user->isAdmin();
107 
+        } else {
108 
+                    return false;
106 109 
         }
107 
-        else
108 
-            return false;
109 110 
     }
110 111
111 112 
     /**
 
@@ -120,9 +121,9 @@  discard block
 
 block discarded – undo
120 121 
         if ($user->role > $user2->role)
121 122 
         {
122 123 
             return $user->isAdmin();
124 
+        } else {
125 
+                    return false;
123 126 
         }
124 
-        else
125 
-            return false;
126 127 
     }
127 128
128 129 
     /**
Please login to merge, or discard this patch.