A free open source IT asset/license management system
Fixed #19394 - dropdowns in floater mode
snipec4ee7a4fee39
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex c0e29bc08f..af1018aced 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -633,7 +633,20 @@ class AssetsController extends Controller&& ! auth()->user()->isSuperUser()) {$companyIds = array_values(array_filter(array_map('intval', explode(',', $request->input('companyId')))));if (! empty($companyIds)) {- $assets->whereIn('assets.company_id', $companyIds);+ if (Setting::getSettings()->null_company_is_floater) {+ // Floater mode: include null-company (floater) assets too,+ // matching the "items from any company can be checked out+ // to targets with no company assignment" policy. Without+ // this the whereIn below hid all floaters from the+ // checkout dropdown while server-side canCheckoutTo still+ // permitted the checkout (#19394).+ $assets->where(function ($q) use ($companyIds) {+ $q->whereIn('assets.company_id', $companyIds)+ ->orWhereNull('assets.company_id');+ });+ } else {+ $assets->whereIn('assets.company_id', $companyIds);+ }}}diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.phpindex bcdd5cf597..f32c1e0153 100644--- a/app/Http/Controllers/Api/LocationsController.php+++ b/app/Http/Controllers/Api/LocationsController.php@@ -488,7 +488,22 @@ class LocationsController extends Controller}if ((Setting::getSettings()->full_multiple_companies_support == '1') && $request->filled('companyId')) {- $locations->where('locations.company_id', '=', (int) $request->input('companyId'));+ $companyId = (int) $request->input('companyId');++ if (Setting::getSettings()->null_company_is_floater) {+ // Floater mode: include null-company (floater) locations too,+ // matching the "items from any company can be checked out+ // to targets with no company assignment" policy. Without+ // this the strict equality below hid all floaters from the+ // checkout dropdown while the server-side canCheckoutTo+ // still permitted the checkout (#19394).+ $locations->where(function ($q) use ($companyId) {+ $q->where('locations.company_id', '=', $companyId)+ ->orWhereNull('locations.company_id');+ });+ } else {+ $locations->where('locations.company_id', '=', $companyId);+ }}$locations = $locations->orderBy('name', 'ASC')->get();diff --git a/tests/Feature/Assets/Api/AssetsForSelectListTest.php b/tests/Feature/Assets/Api/AssetsForSelectListTest.phpindex 0eee966661..951ff4b58c 100644--- a/tests/Feature/Assets/Api/AssetsForSelectListTest.php+++ b/tests/Feature/Assets/Api/AssetsForSelectListTest.php@@ -139,4 +139,56 @@ class AssetsForSelectListTest extends TestCase->assertResponseContainsInResults($assetA)->assertResponseContainsInResults($assetB);}++ /**+ * #19394 regression: under FMCS + floater mode, a company-scoped user+ * asking for assets narrowed by companyId should also see null-company+ * (floater) assets in the results. This matches the documented rule+ * that "items from any company can be checked out to targets with no+ * company assignment" — server-side canCheckoutTo already permits the+ * checkout, so the picker must not hide the target.+ */+ public function test_floater_assets_appear_in_selectlist_under_floater_mode_when_narrowed_by_company()+ {+ $this->settings->enableMultipleFullCompanySupport();+ $this->settings->enableFloaterMode();++ [$companyA, $companyB] = Company::factory()->count(2)->create();++ $companyAsset = Asset::factory()->for($companyA)->create(['asset_tag' => 'FLOATER-CA']);+ $otherCompanyAsset = Asset::factory()->for($companyB)->create(['asset_tag' => 'FLOATER-CB']);+ $floaterAsset = Asset::factory()->create(['asset_tag' => 'FLOATER-NULL', 'company_id' => null]);++ $actor = User::factory()->createAssets()->forCompany($companyA->id)->create();++ $this->actingAsForApi($actor)+ ->getJson(route('assets.selectlist', ['companyId' => $companyA->id]))+ ->assertResponseContainsInResults($companyAsset)+ ->assertResponseContainsInResults($floaterAsset)+ ->assertResponseDoesNotContainInResults($otherCompanyAsset);+ }++ /**+ * #19394 negative counterpart: under FMCS + strict mode (floater OFF),+ * the companyId narrowing stays exact — null-company assets must NOT+ * leak into the picker for a company-scoped caller. Otherwise turning+ * floater mode off would silently still show floaters, breaking the+ * "null is treated as its own pseudo-company" strict-mode contract.+ */+ public function test_floater_assets_are_hidden_in_selectlist_under_strict_mode_when_narrowed_by_company()+ {+ $this->settings->enableMultipleFullCompanySupport();+ $this->settings->disableFloaterMode();++ $companyA = Company::factory()->create();+ $companyAsset = Asset::factory()->for($companyA)->create(['asset_tag' => 'STRICT-CA']);+ $floaterAsset = Asset::factory()->create(['asset_tag' => 'STRICT-NULL', 'company_id' => null]);++ $actor = User::factory()->createAssets()->forCompany($companyA->id)->create();++ $this->actingAsForApi($actor)+ ->getJson(route('assets.selectlist', ['companyId' => $companyA->id]))+ ->assertResponseContainsInResults($companyAsset)+ ->assertResponseDoesNotContainInResults($floaterAsset);+ }}diff --git a/tests/Feature/Locations/Api/LocationsForSelectListTest.php b/tests/Feature/Locations/Api/LocationsForSelectListTest.phpindex 772c25a727..a199641b12 100644--- a/tests/Feature/Locations/Api/LocationsForSelectListTest.php+++ b/tests/Feature/Locations/Api/LocationsForSelectListTest.php@@ -2,6 +2,7 @@namespace Tests\Feature\Locations\Api;+use App\Models\Company;use App\Models\Location;use App\Models\User;use Illuminate\Testing\Fluent\AssertableJson;@@ -124,4 +125,59 @@ class LocationsForSelectListTest extends TestCase$this->assertTrue($texts->contains('-- DC1'), 'One-level-deep location gets a two-dash indent.');$this->assertTrue($texts->contains('---- Rack 1'), 'Two-levels-deep location gets a four-dash indent.');}++ /**+ * #19394 regression: under FMCS + floater mode, a company-scoped user+ * asking for locations narrowed by companyId should also see+ * null-company (floater) locations. Matches the documented "items+ * from any company can be checked out to targets with no company+ * assignment" rule that server-side canCheckoutTo already enforces.+ */+ public function test_floater_locations_appear_in_selectlist_under_floater_mode_when_narrowed_by_company()+ {+ $this->settings->enableMultipleFullCompanySupport();+ $this->settings->enableFloaterMode();++ [$companyA, $companyB] = Company::factory()->count(2)->create();++ $companyLocation = Location::factory()->create(['name' => 'FloaterModeLocA', 'company_id' => $companyA->id]);+ $otherCompanyLocation = Location::factory()->create(['name' => 'FloaterModeLocB', 'company_id' => $companyB->id]);+ $floaterLocation = Location::factory()->create(['name' => 'FloaterModeLocNull', 'company_id' => null]);++ $actor = User::factory()->createUsers()->forCompany($companyA->id)->create();++ $response = $this->actingAsForApi($actor)+ ->getJson(route('api.locations.selectlist', ['companyId' => $companyA->id]))+ ->assertOk();++ $ids = collect($response->json('results'))->pluck('id')->all();+ $this->assertContains($companyLocation->id, $ids, 'Same-company location must be visible.');+ $this->assertContains($floaterLocation->id, $ids, 'Null-company (floater) location must be visible under floater mode.');+ $this->assertNotContains($otherCompanyLocation->id, $ids, 'Other-company location must not leak in.');+ }++ /**+ * #19394 negative counterpart: under FMCS + strict mode (floater OFF),+ * the companyId narrowing must stay exact — null-company locations+ * do not leak into the picker for a company-scoped caller.+ */+ public function test_floater_locations_are_hidden_in_selectlist_under_strict_mode_when_narrowed_by_company()+ {+ $this->settings->enableMultipleFullCompanySupport();+ $this->settings->disableFloaterMode();++ $companyA = Company::factory()->create();+ $companyLocation = Location::factory()->create(['name' => 'StrictLocA', 'company_id' => $companyA->id]);+ $floaterLocation = Location::factory()->create(['name' => 'StrictLocNull', 'company_id' => null]);++ $actor = User::factory()->createUsers()->forCompany($companyA->id)->create();++ $response = $this->actingAsForApi($actor)+ ->getJson(route('api.locations.selectlist', ['companyId' => $companyA->id]))+ ->assertOk();++ $ids = collect($response->json('results'))->pluck('id')->all();+ $this->assertContains($companyLocation->id, $ids);+ $this->assertNotContains($floaterLocation->id, $ids, 'Null-company location must not appear under strict mode.');+ }}