diff --git a/src/Biopen/GeoDirectoryBundle/Document/Import.php b/src/Biopen/GeoDirectoryBundle/Document/Import.php index 78fb1c6aa73c970148f09c40d95ab56abf59a60a..1502d2016ae4919427bd7ba12d6481ca771dd9c5 100644 --- a/src/Biopen/GeoDirectoryBundle/Document/Import.php +++ b/src/Biopen/GeoDirectoryBundle/Document/Import.php @@ -152,8 +152,8 @@ class Import extends AbstractFile */ public function validate(ExecutionContextInterface $context) { - if (preg_match("/new |process|mongo/i", $this->customCode)) { - $context->buildViolation("Il est interdit d'utiliser les mots suivants: new, mongo, process... Merci de ne pas faire de betises !") + if (preg_match("/new |process|mongo|this|symfony/i", $this->customCode)) { + $context->buildViolation("Il est interdit d'utiliser les mots suivants: new, mongo, process, this, symfony... Merci de ne pas faire de betises !") ->atPath('customCode') ->addViolation(); } diff --git a/src/Biopen/GeoDirectoryBundle/Resources/views/admin/edit/edit_import_dynamic.html.twig b/src/Biopen/GeoDirectoryBundle/Resources/views/admin/edit/edit_import_dynamic.html.twig index 797b18d8dd132324d9933b85923c34fe9d9615ed..fc86970d1ad61c4dce1a474858aac3ba49fc075b 100755 --- a/src/Biopen/GeoDirectoryBundle/Resources/views/admin/edit/edit_import_dynamic.html.twig +++ b/src/Biopen/GeoDirectoryBundle/Resources/views/admin/edit/edit_import_dynamic.html.twig @@ -22,5 +22,10 @@ <a href="{{ admin.generateObjectUrl('list', object) }}" class="btn btn-default view_link"> <i class="fa fa-list" aria-hidden="true"></i>Retour à la liste </a> + {% if object.id != "" %} + <a href="{{ admin.generateObjectUrl('delete', object) }}" class="btn btn-danger view_link"> + <i class="fa fa-trash" aria-hidden="true"></i>Supprimer (ainsi que tous les éléments importés) + </a> + {% endif %} {% endblock %}