Skip to content

A free open source IT asset/license management system

Fixed #19792 - array structure for Jamf School OS version

snipe15089d6859d5
diff --git a/app/SyncAdapters/JamfSchool/JamfSchoolAdapter.php b/app/SyncAdapters/JamfSchool/JamfSchoolAdapter.php
index 47ae569604..3c90668df2 100644
--- a/app/SyncAdapters/JamfSchool/JamfSchoolAdapter.php
+++ b/app/SyncAdapters/JamfSchool/JamfSchoolAdapter.php
@@ -121,8 +121,8 @@ class JamfSchoolAdapter extends SyncAdapter
manufacturer: 'Apple',
primaryMac: Arr::get($device, 'wifiMacAddress'),
primaryIp: null,
- os: Arr::get($device, 'os'),
- osVersion: Arr::get($device, 'osVersion'),
+ os: Arr::get($device, 'os.prefix'),
+ osVersion: Arr::get($device, 'os.version'),
lastSeen: $this->parseTimestamp(Arr::get($device, 'lastCheckin')),
assetTag: Arr::get($device, 'assetTag'),
vendorGroupId: Arr::has($device, 'locationId') ? (string) Arr::get($device, 'locationId') : null,
diff --git a/tests/Feature/SyncAdapters/JamfSchool/JamfSchoolAdapterTest.php b/tests/Feature/SyncAdapters/JamfSchool/JamfSchoolAdapterTest.php
index 33885207f5..e27662c1c9 100644
--- a/tests/Feature/SyncAdapters/JamfSchool/JamfSchoolAdapterTest.php
+++ b/tests/Feature/SyncAdapters/JamfSchool/JamfSchoolAdapterTest.php
@@ -141,8 +141,10 @@ class JamfSchoolAdapterTest extends TestCase
'name' => $modelName,
'identifier' => 'iPad12,1',
],
- 'os' => $os,
- 'osVersion' => $osVersion,
+ 'os' => [
+ 'prefix' => $os,
+ 'version' => $osVersion,
+ ],
'wifiMacAddress' => $wifiMac,
'lastCheckin' => $lastCheckin,
'isSupervised' => true,