STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions 2 Packages Projects Releases 3 Wiki Activity

bug fixes

Browse Source
This commit is contained in:
James Collins
2023-04-23 12:18:14 +10:00
parent 89880016ea
commit 95aadd45ee
16 changed files with 187 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Api/UserController.php
View File

@@ -57,7 +57,8 @@ class UserController extends ApiController
return $this->respondAsResource(
$collection,
['isCollection' => true,
'appendData' => ['total' => $total]]
'appendData' => ['total' => $total]
]
);
}
@@ -97,14 +98,14 @@ class UserController extends ApiController
* Update the specified resource in storage.
*
* @param \App\Http\Requests\UserRequest $request The user update request.
* @param \App\Models\User $user The specified user.
* @param \App\Models\User $user The specified user.
* @return \Illuminate\Http\Response
*/
public function update(UserRequest $request, User $user)
{
if (UserConductor::updatable($user) === true) {
$input = [];
$updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
$updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password', 'display_name'];
if ($request->user()->hasPermission('admin/user') === true) {
$updatable = array_merge($updatable, ['email_verified_at']);