@@ -66,10 +66,11 @@ |
||
| 66 | 66 | $site = Site::findOrFail($id); |
| 67 | 67 | $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15); |
| 68 | 68 | |
| 69 | - if (\Request::ajax()) |
|
| 70 | - return response()->json(['site' => $site, 'locations' => $locations]); |
|
| 71 | - else |
|
| 72 | - return view('site.show', [ 'site' => $site, 'locations' => $locations ]); |
|
| 69 | + if (\Request::ajax()) { |
|
| 70 | + return response()->json(['site' => $site, 'locations' => $locations]); |
|
| 71 | + } else { |
|
| 72 | + return view('site.show', [ 'site' => $site, 'locations' => $locations ]); |
|
| 73 | + } |
|
| 73 | 74 | } |
| 74 | 75 | |
| 75 | 76 | /** |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15); |
| 67 | 67 | |
| 68 | 68 | if (\Request::ajax()) |
| 69 | - return response()->json(['site' => $site, 'locations' => $locations]); |
|
| 69 | + return response()->json([ 'site' => $site, 'locations' => $locations ]); |
|
| 70 | 70 | else |
| 71 | 71 | return view('site.show', [ 'site' => $site, 'locations' => $locations ]); |
| 72 | 72 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | 'email' => $request->input('email'), |
| 62 | 62 | 'password' => bcrypt($request->input('password')), |
| 63 | 63 | 'phone' => $request->input('phone'), |
| 64 | - 'role' => $request->input('role'),]); |
|
| 64 | + 'role' => $request->input('role'), ]); |
|
| 65 | 65 | |
| 66 | 66 | return redirect()->route('user.show', $user->id) |
| 67 | 67 | ->with('success', 'User created successfully'); |