svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new companyable trait in the bulk assets controller

Browse Source
This commit is contained in:
snipe
2026-06-13 12:42:48 +01:00
parent 2033f25386
commit 73f72cbbb0
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Assets/BulkAssetsController.php
+2 -11
View File
@@ -689,25 +689,16 @@ class BulkAssetsController extends Controller
}
// Prevent checking out assets across companies if FMCS enabled.
// For users with multiple companies, check all their associated companies via the pivot.
if (Setting::getSettings()->full_multiple_companies_support) {
$company_ids = $assets->pluck('company_id')->filter()->unique();
if ($company_ids->isNotEmpty()) {
$assetCompanyId = (int) $company_ids->first();
if ($company_ids->count() > 1) {
// Selected assets span multiple companies; bulk checkout can't satisfy all of them.
$mismatch = true;
} elseif ($target instanceof User) {
// Users may belong to multiple companies; canReceiveFromCompany() checks the pivot.
$mismatch = ! $target->canReceiveFromCompany($assetCompanyId);
} elseif (is_null($target->company_id)) {
// Target has no company — only a mismatch when floater mode is off.
$mismatch = ! Setting::getSettings()->null_company_is_floater;
} else {
// Both sides have a company; require an exact match.
$mismatch = (int) $target->company_id !== $assetCompanyId;
// All assets share the same company; let the model enforce the checkout rules.
$mismatch = ! $assets->first()->canCheckoutTo($target);
}
if ($mismatch) {