From 15abc316586f89e421902e95c6823946f0218c2d Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Tue, 30 Jul 2019 12:21:01 +0200
Subject: [PATCH] Import add delete button and improve validation on customCode

---
 src/Biopen/GeoDirectoryBundle/Document/Import.php            | 4 ++--
 .../Resources/views/admin/edit/edit_import_dynamic.html.twig | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Biopen/GeoDirectoryBundle/Document/Import.php b/src/Biopen/GeoDirectoryBundle/Document/Import.php
index 78fb1c6aa..1502d2016 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 797b18d8d..fc86970d1 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 %}
 
-- 
GitLab