groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-15 14:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Part-DB:master' into Buerklin-provider

Browse source
This commit is contained in:
Marc 2025-12-08 08:41:24 +01:00 • committed by GitHub
commit bd2d5355c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Services/ImportExportSystem/EntityImporter.php
View file

@ -167,7 +167,7 @@ class EntityImporter
}
//Only return objects once
return array_values(array_unique($valid_entities));
return array_values(array_unique($valid_entities, SORT_REGULAR));
}
/**

2
src/Services/ImportExportSystem/PartKeeprImporter/PKDatastructureImporter.php
View file

@ -152,7 +152,7 @@ class PKDatastructureImporter
public function importPartCustomStates(array $data): int
{
if (!isset($data['partcustomstate'])) {
throw new \RuntimeException('$data must contain a "partcustomstate" key!');
return 0; //Not all PartKeepr installations have custom states
}
$partCustomStateData = $data['partcustomstate'];

5
src/Services/ImportExportSystem/PartKeeprImporter/PKImportHelperTrait.php
View file

@ -150,6 +150,11 @@ trait PKImportHelperTrait
$target->addAttachment($attachment);
$this->em->persist($attachment);
//If the attachment is an image, and the target has no master picture yet, set it
if ($attachment->isPicture() && $target->getMasterPictureAttachment() === null) {
$target->setMasterPictureAttachment($attachment);
}
}
$this->em->flush();

5
src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php
View file

@ -91,7 +91,10 @@ class PKPartImporter
$this->setAssociationField($entity, 'partUnit', MeasurementUnit::class, $part['partUnit_id']);
}
$this->setAssociationField($entity, 'partCustomState', MeasurementUnit::class, $part['partCustomState_id']);
if (isset($part['partCustomState_id'])) {
$this->setAssociationField($entity, 'partCustomState', MeasurementUnit::class,
$part['partCustomState_id']);
}
//Create a part lot to store the stock level and location
$lot = new PartLot();