Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5798 from turbo124/v5-develop

Browse Source 
Fixes for User Route
This commit is contained in:
David Bomba 2021-05-24 10:53:18 +10:00 committed by GitHub
commit a4891bafa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/UserController.php
View File

@ -215,7 +215,9 @@ class UserController extends BaseController
event(new UserWasCreated($user, auth()->user(), $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
return $this->itemResponse($user->fresh());
$user->setCompany($company);
return $this->itemResponse($user);
}
/**

2
app/Repositories/UserRepository.php
View File

@ -114,7 +114,7 @@ class UserRepository extends BaseRepository
}
$user->restore();
return $user;
return $user->fresh();
}
public function destroy(array $data, User $user)