Added a duplicate button in data structures (categories, footprints, etc.) Admin pages.

src/Controller/AdminPages/AttachmentTypeController.php

@@ -90,13 +90,14 @@ class AttachmentTypeController extends BaseAdminController
 
     /**
      * @Route("/new", name="attachment_type_new")
+     * @Route("/{id}/clone", name="attachment_type_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?AttachmentType $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/BaseAdminController.php

@@ -219,10 +219,16 @@ abstract class BaseAdminController extends AbstractController
         ]);
     }
 
-    protected function _new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
+    protected function _new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?AbstractNamedDBElement $entity = null)
     {
+        $master_picture_backup = null;
+        if ($entity === null) {
             /** @var AbstractStructuralDBElement|User $new_entity */
             $new_entity = new $this->entity_class();
+        } else {
+            /** @var AbstractStructuralDBElement|User $new_entity */
+            $new_entity = clone $entity;
+        }
 
         $this->denyAccessUnlessGranted('read', $new_entity);
 
@@ -263,6 +269,7 @@ abstract class BaseAdminController extends AbstractController
 
             $this->commentHelper->setMessage($form['log_comment']->getData());
 
+            dump($new_entity);
             $em->persist($new_entity);
             $em->flush();
             $this->addFlash('success', 'entity.created_flash');

src/Controller/AdminPages/CategoryController.php

@@ -90,13 +90,14 @@ class CategoryController extends BaseAdminController
 
     /**
      * @Route("/new", name="category_new")
+     * @Route("/{id}/clone", name="category_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Category $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/CurrencyController.php

@@ -92,13 +92,14 @@ class CurrencyController extends BaseAdminController
 
     /**
      * @Route("/new", name="currency_new")
+     * @Route("/{id}/clone", name="currency_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Currency $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/DeviceController.php

@@ -90,13 +90,14 @@ class DeviceController extends BaseAdminController
 
     /**
      * @Route("/new", name="device_new")
+     * @Route("/{id}/clone", name="device_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Device $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/FootprintController.php

@@ -90,13 +90,14 @@ class FootprintController extends BaseAdminController
 
     /**
      * @Route("/new", name="footprint_new")
+     * @Route("/{id}/clone", name="footprint_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Footprint $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/ManufacturerController.php

@@ -89,13 +89,14 @@ class ManufacturerController extends BaseAdminController
 
     /**
      * @Route("/new", name="manufacturer_new")
+     * @Route("/{id}/clone", name="manufacturer_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Manufacturer $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/MeasurementUnitController.php

@@ -90,13 +90,14 @@ class MeasurementUnitController extends BaseAdminController
 
     /**
      * @Route("/new", name="measurement_unit_new")
+     * @Route("/{id}/clone", name="measurement_unit_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?MeasurementUnit $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/StorelocationController.php

@@ -88,13 +88,14 @@ class StorelocationController extends BaseAdminController
 
     /**
      * @Route("/new", name="store_location_new")
+     * @Route("/{id}/clone", name="store_location_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Storelocation $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/AdminPages/SupplierController.php

@@ -89,13 +89,14 @@ class SupplierController extends BaseAdminController
 
     /**
      * @Route("/new", name="supplier_new")
+     * @Route("/{id}/clone", name="supplier_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Supplier $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/GroupController.php

@@ -81,13 +81,14 @@ class GroupController extends BaseAdminController
 
     /**
      * @Route("/new", name="group_new")
+     * @Route("/{id}/clone", name="group_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?Group $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Controller/UserController.php

@@ -116,13 +116,14 @@ class UserController extends AdminPages\BaseAdminController
 
     /**
      * @Route("/new", name="user_new")
+     * @Route("/{id}/clone", name="user_clone")
      * @Route("/")
      *
      * @return Response
      */
-    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
+    public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer, ?User $entity = null): Response
     {
-        return $this->_new($request, $em, $importer);
+        return $this->_new($request, $em, $importer, $entity);
     }
 
     /**

src/Form/Type/MasterPictureAttachmentType.php

@@ -43,11 +43,14 @@ declare(strict_types=1);
 namespace App\Form\Type;
 
 use App\Entity\Attachments\Attachment;
+use App\Entity\Attachments\AttachmentContainingDBElement;
 use App\Entity\Contracts\HasMasterAttachmentInterface;
 use Doctrine\ORM\EntityRepository;
 use ReflectionClass;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -79,26 +82,15 @@ class MasterPictureAttachmentType extends AbstractType
                                        };
                                    },
                                    'choice_label' => 'name',
-            'class' => function (Options $options) {
+                                   'choice_loader' => function (Options $options) {
-                $short_class_name = (new ReflectionClass($options['entity']))->getShortName();
+                                       return new CallbackChoiceLoader(function () use ($options) {
-                //Category becomes CategoryAttachment
-                return 'App\\Entity\\Attachments\\'.$short_class_name.'Attachment';
-            },
-            'query_builder' => function (Options $options) {
-                return function (EntityRepository $er) use ($options) {
                                            $entity = $options['entity'];
-                    if (null === $entity->getID()) {
+                                           if (!$entity instanceof AttachmentContainingDBElement) {
-                        //This query is always false, so we get empty results
+                                               throw new \RuntimeException('$entity must have Attachments! (be of type AttachmentContainingDBElement)');
-                        return $er->createQueryBuilder('u')->where('0 = 2');
+                                           }
+                                           return $entity->getAttachments()->toArray();
+                                       });
                                    }
-
-                    return $er->createQueryBuilder('u')
-                        ->where('u.element = ?1')
-                        ->andWhere("u.path <> ''")
-                        ->orderBy('u.name', 'ASC')
-                        ->setParameter(1, $entity);
-                };
-            },
                                ]);
 
         $resolver->setAllowedValues('filter', ['', 'picture', '3d_model']);
@@ -106,6 +98,6 @@ class MasterPictureAttachmentType extends AbstractType
 
     public function getParent()
     {
-        return EntityType::class;
+        return ChoiceType::class;
     }
 }

src/Services/EntityURLGenerator.php

@@ -318,6 +318,17 @@ class EntityURLGenerator
     {
         $map = [
             Part::class => 'part_clone',
+            AttachmentType::class => 'attachment_type_clone',
+            Category::class => 'category_clone',
+            Device::class => 'device_clone',
+            Supplier::class => 'supplier_clone',
+            Manufacturer::class => 'manufacturer_clone',
+            Storelocation::class => 'store_location_clone',
+            Footprint::class => 'footprint_clone',
+            User::class => 'user_clone',
+            Currency::class => 'currency_clone',
+            MeasurementUnit::class => 'measurement_unit_clone',
+            Group::class => 'group_clone',
         ];
 
         return $this->urlGenerator->generate($this->mapToController($map, $entity), ['id' => $entity->getID()]);

templates/AdminPages/EntityAdminBase.html.twig

@@ -147,6 +147,7 @@
 
                         {# Only include on existing parts #}
                         {% if entity.id %}
+                            {{ include('AdminPages/_duplicate.html.twig') }}
                             {{ include('AdminPages/_delete_form.html.twig') }}
                         {% endif %}
 

templates/AdminPages/_duplicate.html.twig

@@ -0,0 +1,5 @@
+<div class="row mb-2">
+    <div class="offset-3 col">
+        <a class="btn btn-info {% if not is_granted('create', entity) %}disabled{% endif %}" href="{{ entity | entityURL('clone') }}">{% trans %}entity.duplicate{% endtrans %}</a>
+    </div>
+</div>