Skip to content

A free open source IT asset/license management system

Updated controllers

snipec377b4119842
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index ed0f7ecced..c5f36353ba 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -234,6 +234,10 @@ class AccessoriesController extends Controller
$total = $accessory_checkouts->count();
$accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+ $accessory_checkouts->loadMorph('assignedTo', [
+ User::class => ['companies'],
+ ]);
+
return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_checkouts, $total);
}
@@ -303,7 +307,7 @@ class AccessoriesController extends Controller
$this->authorize('checkout', $accessory);
$target = $this->determineCheckoutTarget();
- if ((Setting::getSettings()->full_multiple_companies_support == '1') && ($accessory->company_id !== $target->company_id)) {
+ if ((Setting::getSettings()->full_multiple_companies_support == '1') && (! $target->companies()->where('companies.id', $accessory->company_id)->exists())) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.error_user_company')));
}
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 2f75ec9306..5028241a65 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -602,8 +602,11 @@ class AssetsController extends Controller
])->with('model', 'status', 'assignedTo')
->NotArchived();
- if ((Setting::getSettings()->full_multiple_companies_support == '1') && ($request->filled('companyId'))) {
- $assets->where('assets.company_id', $request->input('companyId'));
+ if ((Setting::getSettings()->full_multiple_companies_support == '1') && $request->filled('companyId')) {
+ $companyIds = array_values(array_filter(array_map('intval', explode(',', $request->input('companyId')))));
+ if (! empty($companyIds)) {
+ $assets->whereIn('assets.company_id', $companyIds);
+ }
}
if ($request->filled('statusType') && $request->input('statusType') === 'RTD') {
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 1ef3bff1e3..76f679c46c 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -315,7 +315,7 @@ class ConsumablesController extends Controller
return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
}
- if ((Setting::getSettings()->full_multiple_companies_support == '1') && ($consumable->company_id !== $user->company_id)) {
+ if ((Setting::getSettings()->full_multiple_companies_support == '1') && (! $user->companies()->where('companies.id', $consumable->company_id)->exists())) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.error_user_company')));
}
diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php
index ba93e52ff1..eeecc105aa 100644
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -27,7 +27,7 @@ class LicenseSeatsController extends Controller
if ($license = License::find($licenseId)) {
$this->authorize('view', $license);
- $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department', 'user.company', 'asset.company')
+ $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department', 'user.companies', 'asset.company')
->where('license_seats.license_id', $licenseId);
if ($request->input('status') == 'available') {
@@ -152,7 +152,7 @@ class LicenseSeatsController extends Controller
return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
}
- if ((Setting::getSettings()->full_multiple_companies_support == '1') && ($license->company_id !== $targetUser->company_id)) {
+ if ((Setting::getSettings()->full_multiple_companies_support == '1') && (! $targetUser->companies()->where('companies.id', $license->company_id)->exists())) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.error_user_company')));
}
}
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index fa76ab3a12..9f581c2f93 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -51,7 +51,6 @@ class UsersController extends Controller
'users.address',
'users.avatar',
'users.city',
- 'users.company_id',
'users.country',
'users.created_by',
'users.created_at',
@@ -89,7 +88,7 @@ class UsersController extends Controller
])->with('manager')
->with('groups')
->with('userloc')
- ->with('company')
+ ->with('companies')
->with('department')
->with('createdBy')
->withCount([
@@ -191,7 +190,7 @@ class UsersController extends Controller
}
if ($request->filled('company_id')) {
- $users = $users->where('users.company_id', '=', $request->input('company_id'));
+ $users = $users->whereHas('companies', fn ($q) => $q->where('companies.id', $request->input('company_id')));
}
if ($request->filled('phone')) {
@@ -394,6 +393,13 @@ class UsersController extends Controller
]
)->where('show_in_list', '=', '1');
+ if ((Setting::getSettings()->full_multiple_companies_support == '1') && $request->filled('companyId')) {
+ $companyIds = array_values(array_filter(array_map('intval', explode(',', $request->input('companyId')))));
+ if (! empty($companyIds)) {
+ $users->whereHas('companies', fn ($q) => $q->whereIn('companies.id', $companyIds));
+ }
+ }
+
if ($request->filled('search')) {
$users = $users->where(function ($query) use ($request) {
$query->SimpleNameSearch($request->input('search'))
@@ -441,7 +447,6 @@ class UsersController extends Controller
$authenticatedUser = auth()->user();
$user = new User;
$user->fill($request->all());
- $user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$user->created_by = auth()->id();
if ($request->has('permissions')) {
@@ -486,6 +491,12 @@ class UsersController extends Controller
$user->groups()->sync($request->input('groups'));
}
+ // Sync company memberships from company_ids[] or fall back to scalar company_id
+ $companyIds = array_filter(
+ (array) ($request->input('company_ids') ?? ($request->filled('company_id') ? [$request->input('company_id')] : []))
+ );
+ $user->syncCompaniesWithLogging(Company::getIdsForCurrentUser(array_map('intval', $companyIds)));
+
return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.create')));
}
@@ -575,10 +586,6 @@ class UsersController extends Controller
}
- if ($request->filled('company_id')) {
- $user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
- }
-
if ($user->id == $request->input('manager_id')) {
return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
}
@@ -607,6 +614,14 @@ class UsersController extends Controller
$user->groups()->sync($request->input('groups'));
}
+ // Sync company memberships when company_ids[] or company_id is provided
+ if ($request->has('company_ids') || $request->filled('company_id')) {
+ $companyIds = array_filter(
+ (array) ($request->input('company_ids') ?? ($request->filled('company_id') ? [$request->input('company_id')] : []))
+ );
+ $user->syncCompaniesWithLogging(Company::getIdsForCurrentUser(array_map('intval', $companyIds)));
+ }
+
return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
}
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index 2802a5e0a1..a7ba75fb4c 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -277,7 +277,7 @@ class LocationsController extends Controller
->with('assignedAssets', $location->assignedAssets)
->with('accessories', $location->accessories)
->with('assignedAccessories', $location->assignedAccessories)
- ->with('users', $location->users)
+ ->with('users', $location->users()->with('companies')->get())
->with('location', $location)
->with('consumables', $location->consumables)
->with('components', $location->components)
@@ -297,7 +297,7 @@ class LocationsController extends Controller
->with('assignedAssets', $location->assignedAssets)
->with('accessories', $location->accessories)
->with('assignedAccessories', $location->assignedAccessories)
- ->with('users', $location->users)
+ ->with('users', $location->users()->with('companies')->get())
->with('location', $location)
->with('consumables', $location->consumables)
->with('components', $location->components)
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index d170eef071..2cee056fd4 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
use App\Models\Accessory;
use App\Models\Actionlog;
use App\Models\Asset;
+use App\Models\Company;
use App\Models\ConsumableAssignment;
use App\Models\Group;
use App\Models\License;
@@ -168,7 +169,6 @@ class BulkUsersController extends Controller
$this->conditionallyAddItem('location_id')
->conditionallyAddItem('department_id')
- ->conditionallyAddItem('company_id')
->conditionallyAddItem('locale')
->conditionallyAddItem('remote')
->conditionallyAddItem('ldap_import')
@@ -202,7 +202,7 @@ class BulkUsersController extends Controller
$this->update_array['manager_id'] = null;
}
- if ($request->input('null_company_id') == '1') {
+ if ($request->input('null_company_ids') == '1') {
$this->update_array['company_id'] = null;
}
@@ -235,6 +235,22 @@ class BulkUsersController extends Controller
->update(['location_id' => $this->update_array['location_id']]);
}
+ // Handle company pivot sync separately from the mass update.
+ // company_ids[] comes from the multi-select; null_company_ids clears all memberships.
+ $bulkCompanyIds = array_filter(array_map('intval', (array) $request->input('company_ids', [])));
+ $clearCompanies = $request->input('null_company_ids') == '1';
+
+ if ($bulkCompanyIds || $clearCompanies) {
+ $allowedIds = Company::getIdsForCurrentUser($bulkCompanyIds);
+ // Also update the scalar company_id column for display/backward compat.
+ $scalarCompanyId = $allowedIds[0] ?? null;
+ User::whereIn('id', $user_raw_array)->where('id', '!=', auth()->id())
+ ->update(['company_id' => $scalarCompanyId]);
+ foreach ($users as $user) {
+ $user->companies()->sync($allowedIds);
+ }
+ }
+
// Only sync groups if groups were selected
if ($request->filled('groups')) {
@@ -461,6 +477,12 @@ class BulkUsersController extends Controller
$managedLocation->save();
}
+ // Carry over company pivot memberships from the merged user into the target.
+ $mergedCompanyIds = $user_to_merge->companies()->pluck('companies.id')->toArray();
+ if (! empty($mergedCompanyIds)) {
+ $merge_into_user->companies()->syncWithoutDetaching($mergedCompanyIds);
+ }
+
$user_to_merge->delete();
event(new UserMerged($user_to_merge, $merge_into_user, $admin));
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 5b93b145f8..0a3d5f47f4 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -123,7 +123,7 @@ class UsersController extends Controller
$user->mobile = $request->input('mobile');
$user->location_id = $request->input('location_id', null);
$user->department_id = $request->input('department_id', null);
- $user->company_id = Company::getIdForUser($request->input('company_id', null));
+ $companyIds = array_filter(array_map('intval', (array) ($request->input('company_ids') ?? ($request->filled('company_id') ? [$request->input('company_id')] : []))));
$user->manager_id = $request->input('manager_id', null);
$user->notes = $request->input('notes');
$user->address = $request->input('address', null);
@@ -153,6 +153,7 @@ class UsersController extends Controller
}
if ($user->save()) {
+ $user->syncCompaniesWithLogging(Company::getIdsForCurrentUser($companyIds));
if (($user->activated == '1') && ($user->email != '') && ($request->input('send_welcome') == '1')) {
@@ -275,7 +276,7 @@ class UsersController extends Controller
$user->phone = $request->input('phone');
$user->mobile = $request->input('mobile');
$user->location_id = $request->input('location_id', null);
- $user->company_id = Company::getIdForUser($request->input('company_id', null));
+ $companyIds = array_filter(array_map('intval', (array) ($request->input('company_ids') ?? ($request->filled('company_id') ? [$request->input('company_id')] : []))));
$user->manager_id = $request->input('manager_id', null);
$user->notes = $request->input('notes');
$user->department_id = $request->input('department_id', null);
@@ -336,6 +337,8 @@ class UsersController extends Controller
session()->put(['redirect_option' => $request->input('redirect_option')]);
if ($user->save()) {
+ $user->syncCompaniesWithLogging(Company::getIdsForCurrentUser($companyIds));
+
// Redirect to the user page
return Helper::getRedirectOption($request, $user->id, 'Users')
->with('success', trans('admin/users/message.success.update'));
@@ -480,7 +483,7 @@ class UsersController extends Controller
$permissions = $request->input('permissions', []);
app('request')->request->set('permissions', $permissions);
- $user_to_clone = User::with('userloc')->withTrashed()->find($user->id);
+ $user_to_clone = User::with('userloc', 'companies')->withTrashed()->find($user->id);
// Make sure they can view this particular user
$this->authorize('view', $user_to_clone);
@@ -598,7 +601,7 @@ class UsersController extends Controller
'manager',
'groups',
'userloc',
- 'company',
+ 'companies',
'createdBy'
)->withCount(['managesUsers as manages_users_count', 'managedLocations as manages_locations_count'])
->orderBy('created_at', 'DESC')
@@ -620,7 +623,7 @@ class UsersController extends Controller
// Add a new row with data
$values = [
$user->id,
- ($user->company) ? $user->company->name : '',
+ $user->companies->pluck('name')->implode('|'),
$user->jobtitle,
$user->employee_num,
$user->first_name,