Skip to content

Commit

Permalink
Merge pull request #6 from bdasdoria/main
Browse files Browse the repository at this point in the history
Translations + Validations + Suppression de pictogrammes n'entraîne pas la suppression des produits
  • Loading branch information
pvasdoria authored Jun 8, 2022
2 parents 14f01dd + a4e86e8 commit c4b4801
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Form/Type/PictogramType.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
])
->add('image', PictogramImageType::class, [
'label' => 'asdoria.form.pictogram.main_image',
'data_class' => PictogramImage::class
'data_class' => PictogramImage::class,
]);
}

Expand Down
10 changes: 9 additions & 1 deletion src/Resources/config/doctrine/Pictogram.orm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,16 @@

<many-to-many field="products" target-entity="Sylius\Component\Core\Model\ProductInterface" mapped-by="pictograms" orphan-removal="true">
<cascade>
<cascade-all/>
<cascade-refresh/>
</cascade>
<join-table name="asdoria_pictogram_products">
<join-columns>
<join-column name="pictogram_id" referenced-column-name="id" nullable="false" on-delete="CASCADE" />
</join-columns>
<inverse-join-columns>
<join-column name="product_id" referenced-column-name="id" nullable="false" on-delete="CASCADE" />
</inverse-join-columns>
</join-table>
</many-to-many>

</mapped-superclass>
Expand Down
18 changes: 18 additions & 0 deletions src/Resources/config/validation/pictogram.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Asdoria\SyliusPictogramPlugin\Entity\Pictogram:
constraints:
- Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
fields: [ code ]
groups: [ sylius ]
message: 'asdoria.ui.pictogram_group.code.unique'
properties:
code:
- NotBlank:
groups: [ sylius ]
message: 'asdoria.ui.pictogram_group.code.not_blank'
pictogramGroup:
- NotBlank:
groups: [ sylius ]
message: 'asdoria.ui.pictogram.group.not_blank'
image:
- Valid:
groups: [ sylius ]
14 changes: 14 additions & 0 deletions src/Resources/config/validation/pictogram_group.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Asdoria\SyliusPictogramPlugin\Entity\PictogramGroup:
constraints:
- Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
fields: [ code ]
groups: [ sylius ]
message: 'asdoria.ui.pictogram_group.code.unique'
properties:
code:
- NotBlank:
groups: [ sylius ]
message: 'asdoria.ui.pictogram_group.code.not_blank'
translations:
- Valid:
groups: [ sylius ]
11 changes: 11 additions & 0 deletions src/Resources/config/validation/pictogram_group_translation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Asdoria\SyliusPictogramPlugin\Entity\PictogramGroupTranslation:
constraints:
- Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
fields: [ name ]
groups: [ sylius ]
message: 'asdoria.ui.pictogram_group.name.unique'
properties:
name:
- NotBlank:
groups: [ sylius ]
message: 'asdoria.ui.pictogram_group_translation.name.not_blank'
6 changes: 6 additions & 0 deletions src/Resources/config/validation/pictogram_image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Asdoria\SyliusPictogramPlugin\Entity\PictogramImage:
properties:
file:
- NotBlank:
groups: [ sylius ]
message: 'asdoria.ui.image.path.not_blank'
4 changes: 2 additions & 2 deletions src/Resources/translations/messages.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ asdoria:
pictogram_group: Pictogram Group
new_pictogram: New Pictogram
new_pictogram_group: New pictogram group
edit_pictogram_group: Modify ictogram group
edit_pictogram: Modify pictogram
edit_pictogram_group: Edit pictogram group
edit_pictogram: Edit pictogram
manage_pictograms: Managing Pictograms
form:
pictogram:
Expand Down
18 changes: 18 additions & 0 deletions src/Resources/translations/validators.en.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
asdoria:
ui:
pictogram:
group:
not_blank: A pictogram must be linked to a group.
image:
not_blank: A pictogram must have an image to illustrate himself.
pictogram_group:
code:
unique: This code is already taken.
not_blank: The "Code" field can not be empty.
pictogram_group_translation:
name:
unique: The name is already taken.
not_blank: The "Name" field can not be empty.
image:
path:
not_blank: You must upload an image.
18 changes: 18 additions & 0 deletions src/Resources/translations/validators.fr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
asdoria:
ui:
pictogram:
group:
not_blank: Un pictogramme doit être lié à un groupe.
image:
not_blank: Un pictogramme doit avoir une image d'illustration.
pictogram_group:
code:
unique: Ce code existe déjà.
not_blank: Ce champs ne peut pas être vide.
pictogram_group_translation:
name:
unique: Ce nom est déjà pris.
not_blank: Ce champs ne peut pas être vide.
image:
path:
not_blank: Vous devez choisir une image.

0 comments on commit c4b4801

Please sign in to comment.