@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * Store a newly created resource in storage. |
| 53 | 53 | * |
| 54 | 54 | * @param CreateUserRequest $request |
| 55 | - * @return \Illuminate\Http\Response |
|
| 55 | + * @return \Illuminate\Http\JsonResponse |
|
| 56 | 56 | */ |
| 57 | 57 | public function store(CreateUserRequest $request) |
| 58 | 58 | { |
@@ -108,7 +108,6 @@ discard block |
||
| 108 | 108 | * @param UpdateUserRequest|Request $request |
| 109 | 109 | * @param $user_id |
| 110 | 110 | * @param $type Type of update info|password|adddevice|removedevice|addpor|removeport |
| 111 | - * @param int $id |
|
| 112 | 111 | * @return \Illuminate\Http\Response |
| 113 | 112 | */ |
| 114 | 113 | public function update(UpdateUserRequest $request, $user_id) |
@@ -129,7 +128,7 @@ discard block |
||
| 129 | 128 | * Remove the specified resource from storage. |
| 130 | 129 | * |
| 131 | 130 | * @param int $user_id |
| 132 | - * @return \Illuminate\Http\Response |
|
| 131 | + * @return \Illuminate\Http\JsonResponse |
|
| 133 | 132 | */ |
| 134 | 133 | public function destroy(DeleteUserRequest $request, $user_id) |
| 135 | 134 | { |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | if ($this->input('update') == 'password') { |
| 57 | 57 | $user_id = $this->input('user_id'); |
| 58 | 58 | $rules = ['password' => 'required|min:5|max:255', |
| 59 | - 'password_confirmation' => 'required|same:password', |
|
| 59 | + 'password_confirmation' => 'required|same:password', |
|
| 60 | 60 | ]; |
| 61 | 61 | if (!Auth::user()->isAdmin() || Auth::id() == $user_id) { |
| 62 | 62 | $rules['current_password'] = 'required|password:'.$user_id; |