Skip to content

Commit 147fcfb

Browse files
authored
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
2 parents 58a3d09 + fdcc17c commit 147fcfb

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

app/Http/Controllers/Api/UsersController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use App\Models\Actionlog;
1515
use App\Models\Asset;
1616
use App\Models\Accessory;
17+
use App\Models\Company;
1718
use App\Models\Consumable;
1819
use App\Models\License;
1920
use App\Models\User;
@@ -371,6 +372,7 @@ public function store(SaveUserRequest $request) : JsonResponse
371372

372373
$user = new User;
373374
$user->fill($request->all());
375+
$user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
374376
$user->created_by = auth()->id();
375377

376378
if ($request->has('permissions')) {
@@ -452,6 +454,10 @@ public function update(SaveUserRequest $request, User $user): JsonResponse
452454

453455
$user->fill($request->all());
454456

457+
if ($request->filled('company_id')) {
458+
$user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
459+
}
460+
455461
if ($user->id == $request->input('manager_id')) {
456462
return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
457463
}

0 commit comments

Comments
 (0)