Skip to content

A free open source IT asset/license management system

Make category nullable, fallback to “Discovered Devices”

snipe2328e16f3d43
diff --git a/app/SyncAdapters/SyncAdapter.php b/app/SyncAdapters/SyncAdapter.php
index 960daaeaac..5a86f2cb33 100644
--- a/app/SyncAdapters/SyncAdapter.php
+++ b/app/SyncAdapters/SyncAdapter.php
@@ -365,7 +365,7 @@ abstract class SyncAdapter
$rules = [
$slug.'_asset_tag_pattern' => ['nullable', 'string', 'max:191', new \App\Rules\AssetTagPatternRule],
- $slug.'_default_category_id' => ['required', 'integer', 'exists:categories,id'],
+ $slug.'_default_category_id' => ['nullable', 'integer', 'exists:categories,id'],
$slug.'_default_status_id' => ['required', 'integer', 'exists:status_labels,id'],
$slug.'_user_match_strategy' => ['nullable', 'string', 'in:none,email,username,username_then_email'],
];
diff --git a/resources/views/blade/sync-adapter/form.blade.php b/resources/views/blade/sync-adapter/form.blade.php
index d9fae02567..d1cb8b1202 100644
--- a/resources/views/blade/sync-adapter/form.blade.php
+++ b/resources/views/blade/sync-adapter/form.blade.php
@@ -157,7 +157,6 @@
:selected="old($slug . '_default_category_id', $adapter->defaultCategoryId())"
categoryType="asset"
:help_text="trans('admin/settings/sync_adapters.default_category_help')"
- required
/>
{{-- Default status label for auto-created assets. Required so
diff --git a/tests/Feature/SyncAdapters/AssetTagPatternTest.php b/tests/Feature/SyncAdapters/AssetTagPatternTest.php
index 3d6ffc7d12..4a6eb741a6 100644
--- a/tests/Feature/SyncAdapters/AssetTagPatternTest.php
+++ b/tests/Feature/SyncAdapters/AssetTagPatternTest.php
@@ -204,6 +204,41 @@ class AssetTagPatternTest extends TestCase
);
}
+ public function test_default_category_id_may_be_left_blank_on_save_and_triggers_discovered_hardware_fallback()
+ {
+ // The help text on the settings form advertises the Discovered
+ // Hardware fallback for blank input. Regression coverage for the
+ // form-side path: a save with an empty fleet_default_category_id
+ // must succeed (not 422), must store nothing, and must route the
+ // next sync's auto-created model into Discovered Hardware.
+ $fleet = $this->configuredFleet();
+
+ $this->actingAs(\App\Models\User::factory()->superuser()->create())
+ ->post(route('settings.adapters.save', $fleet), [
+ 'fleet_url' => 'https://example.com/fleet',
+ 'fleet_token' => 'fake-token',
+ 'fleet_default_category_id' => '',
+ 'fleet_default_status_id' => Statuslabel::factory()->rtd()->create()->id,
+ ])
+ ->assertSessionHasNoErrors()
+ ->assertRedirect();
+
+ $stored = SyncAdapterConfig::get($fleet->id, 'default_category_id');
+ $this->assertTrue($stored === null || $stored === '');
+
+ SyncAdapter::syncFromRecord(new HostInventoryRecord(
+ sourceKey: 'fleet',
+ sourceId: 'cat-blank',
+ hostname: 'wksn-blank',
+ hardwareSerial: 'SN-BLANK',
+ hardwareModel: 'Model-For-Blank-Category-Test',
+ ));
+
+ $model = \App\Models\AssetModel::where('name', 'Model-For-Blank-Category-Test')->firstOrFail();
+ $fallback = Category::where('name', 'Discovered Hardware')->firstOrFail();
+ $this->assertSame($fallback->id, (int) $model->category_id);
+ }
+
private function configuredFleet(): SyncAdapterInstance
{
$instance = SyncAdapterInstance::where('slug', 'fleet')->firstOrFail();