groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-13 21:59:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'origin/feature/custom-part-status' into feature/all-features

Browse source 
# Conflicts:
#	docs/configuration.md
#	migrations/Version20250321141740.php
#	src/Entity/Attachments/Attachment.php
#	src/Entity/Base/AbstractDBElement.php
#	src/Entity/LogSystem/CollectionElementDeleted.php
#	src/Entity/LogSystem/LogTargetType.php
#	src/Entity/Parameters/AbstractParameter.php
#	src/Entity/Parts/PartCustomState.php
#	src/Security/Voter/AttachmentVoter.php
#	templates/parts/edit/_advanced.html.twig
#	tests/Controller/AdminPages/PartCustomStateControllerTest.php
#	translations/messages.cs.xlf
#	translations/messages.el.xlf
#	translations/messages.fr.xlf
#	translations/messages.ja.xlf
#	translations/messages.nl.xlf
This commit is contained in:
Marcel Diegelmann 2025-10-01 09:15:53 +02:00
commit 73a2b16332
7 changed files with 170 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Entity/Parts/PartCustomState.php
View file

@ -107,7 +107,7 @@ class PartCustomState extends AbstractPartsContainingDBElement
/** @var Collection<int, PartCustomStateAttachment> /** @var Collection<int, PartCustomStateAttachment>
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: PartCustomStateAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: PartCustomStateParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => 'ASC'])]
#[Groups(['part_custom_state:read', 'part_custom_state:write'])] #[Groups(['part_custom_state:read', 'part_custom_state:write'])]
protected Collection $parameters; protected Collection $parameters;

1
src/Settings/BehaviorSettings/PartTableColumns.php
View file

@ -46,6 +46,7 @@ enum PartTableColumns : string implements TranslatableInterface
case FAVORITE = "favorite"; case FAVORITE = "favorite";
case MANUFACTURING_STATUS = "manufacturing_status"; case MANUFACTURING_STATUS = "manufacturing_status";
case MPN = "manufacturer_product_number"; case MPN = "manufacturer_product_number";
case CUSTOM_PART_STATE = 'partCustomState';
case MASS = "mass"; case MASS = "mass";
case TAGS = "tags"; case TAGS = "tags";
case ATTACHMENTS = "attachments"; case ATTACHMENTS = "attachments";

2
src/Settings/BehaviorSettings/TableSettings.php
View file

@ -67,7 +67,7 @@ class TableSettings
#[Assert\All([new Assert\Type(PartTableColumns::class)])] #[Assert\All([new Assert\Type(PartTableColumns::class)])]
public array $partsDefaultColumns = [PartTableColumns::NAME, PartTableColumns::DESCRIPTION, public array $partsDefaultColumns = [PartTableColumns::NAME, PartTableColumns::DESCRIPTION,
PartTableColumns::CATEGORY, PartTableColumns::FOOTPRINT, PartTableColumns::MANUFACTURER, PartTableColumns::CATEGORY, PartTableColumns::FOOTPRINT, PartTableColumns::MANUFACTURER,
PartTableColumns::LOCATION, PartTableColumns::AMOUNT]; PartTableColumns::LOCATION, PartTableColumns::AMOUNT, PartTableColumns::CUSTOM_PART_STATE];
/** @var AssemblyTableColumns[] */ /** @var AssemblyTableColumns[] */
#[SettingsParameter(ArrayType::class, #[SettingsParameter(ArrayType::class,

9
tests/Controller/AdminPages/PartCustomStateControllerTest.php
View file

@ -23,12 +23,11 @@ declare(strict_types=1);
namespace App\Tests\Controller\AdminPages; namespace App\Tests\Controller\AdminPages;
use App\Entity\Parts\PartCustomState; use App\Entity\Parts\PartCustomState;
use PHPUnit\Framework\Attributes\Group;
/** #[Group('slow')]
* @group slow #[Group('DB')]
* @group DB class PartCustomStateControllerTest extends AbstractAdminController
*/
class PartCustomStateControllerTest extends AbstractAdminControllerTest
{ {
protected static string $base_path = '/en/part_custom_state'; protected static string $base_path = '/en/part_custom_state';
protected static string $entity_class = PartCustomState::class; protected static string $entity_class = PartCustomState::class;

2
translations/messages.cs.xlf
View file

@ -10374,7 +10374,7 @@ Element 3</target>
<target>Cílový inventář</target> <target>Cílový inventář</target>
</segment> </segment>
</unit> </unit>
<unit id="pyv0k6b" name="project.builds.number_of_builds"> <unit id="5DTAvWG" name="project.builds.number_of_builds">
<segment state="translated"> <segment state="translated">
<source>project.builds.number_of_builds</source> <source>project.builds.number_of_builds</source>
<target>Množství sestavy</target> <target>Množství sestavy</target>

6
translations/messages.el.xlf
View file

@ -1601,12 +1601,6 @@
<target>Προσαρμοσμένη κατάσταση εξαρτήματος</target> <target>Προσαρμοσμένη κατάσταση εξαρτήματος</target>
</segment> </segment>
</unit> </unit>
<unit id="G1hmQdb" name="part.table.partCustomState">
<segment state="translated">
<source>part.table.partCustomState</source>
<target>Προσαρμοσμένη κατάσταση μέρους</target>
</segment>
</unit>
<unit id="FV7YOW6" name="part.table.name.value.for_part"> <unit id="FV7YOW6" name="part.table.name.value.for_part">
<segment state="translated"> <segment state="translated">
<source>part.table.name.value.for_part</source> <source>part.table.name.value.for_part</source>