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

Allow removing deleted user

Browse Source
This commit is contained in:
David Bomba 2023-03-15 11:05:58 +11:00
parent 6f1171f3b7
commit 434d2f6763
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,9 +592,9 @@ class UserController extends BaseController
*/ */
public function detach(DetachCompanyUserRequest $request, User $user) public function detach(DetachCompanyUserRequest $request, User $user)
{ {
if ($request->entityIsDeleted($user)) { // if ($request->entityIsDeleted($user)) {
return $request->disallowUpdate(); // return $request->disallowUpdate();
} // }
$company_user = CompanyUser::whereUserId($user->id) $company_user = CompanyUser::whereUserId($user->id)
->whereCompanyId(auth()->user()->companyId()) ->whereCompanyId(auth()->user()->companyId())

4
app/Http/Requests/User/DetachCompanyUserRequest.php
View File

@ -12,14 +12,10 @@
namespace App\Http\Requests\User; namespace App\Http\Requests\User;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\User;
use App\Utils\Traits\ChecksEntityStatus;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
class DetachCompanyUserRequest extends Request class DetachCompanyUserRequest extends Request
{ {
use MakesHash;
use ChecksEntityStatus;
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.