Allow timetraveling on data structures admin pages.

src/Controller/AdminPages/AttachmentTypeController.php

@@ -79,7 +79,7 @@ class AttachmentTypeController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="attachment_type_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="attachment_type_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      *
      * @param  AttachmentType  $entity
@@ -87,9 +87,9 @@ class AttachmentTypeController extends BaseAdminController
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(AttachmentType $entity, Request $request, EntityManagerInterface $em): Response
+    public function edit(AttachmentType $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null): Response
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/BaseAdminController.php

@@ -112,11 +112,23 @@ abstract class BaseAdminController extends AbstractController
     }
 
 
-    protected function _edit(AbstractNamedDBElement $entity, Request $request, EntityManagerInterface $em) : Response
+    protected function _edit(AbstractNamedDBElement $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null) : Response
     {
         $this->denyAccessUnlessGranted('read', $entity);
 
 
+        $timeTravel_timestamp = null;
+        if ($timestamp !== null) {
+            //If the timestamp only contains numbers interpret it as unix timestamp
+            if (ctype_digit($timestamp)) {
+                $timeTravel_timestamp = new \DateTime();
+                $timeTravel_timestamp->setTimestamp((int) $timestamp);
+            } else { //Try to parse it via DateTime
+                $timeTravel_timestamp = new \DateTime($timestamp);
+            }
+            $this->timeTravel->revertEntityToTimestamp($entity, $timeTravel_timestamp);
+        }
+
         $table = $this->dataTableFactory->createFromType(LogDataTable::class, [
             'filter_elements' => $this->historyHelper->getAssociatedElements($entity),
             'mode' => 'element_history'
@@ -127,7 +139,10 @@ abstract class BaseAdminController extends AbstractController
             return $table->getResponse();
         }
 
-        $form = $this->createForm($this->form_class, $entity, ['attachment_class' => $this->attachment_class]);
+        $form = $this->createForm($this->form_class, $entity, [
+            'attachment_class' => $this->attachment_class,
+            'disabled' => $timeTravel_timestamp !== null ? true : null
+        ]);
 
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
@@ -176,7 +191,8 @@ abstract class BaseAdminController extends AbstractController
             'form' => $form->createView(),
             'attachment_helper' => $this->attachmentHelper,
             'route_base' => $this->route_base,
-            'datatable' => $table
+            'datatable' => $table,
+            'timeTravel' => $timeTravel_timestamp
         ]);
     }
 

src/Controller/AdminPages/CategoryController.php

@@ -79,7 +79,7 @@ class CategoryController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="category_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="category_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      *
      * @param  Category  $entity
@@ -87,9 +87,9 @@ class CategoryController extends BaseAdminController
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Category $entity, Request $request, EntityManagerInterface $em): Response
+    public function edit(Category $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null): Response
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/CurrencyController.php

@@ -81,7 +81,7 @@ class CurrencyController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="currency_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="currency_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      *
      * @param  Currency  $entity
@@ -89,9 +89,9 @@ class CurrencyController extends BaseAdminController
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Currency $entity, Request $request, EntityManagerInterface $em): Response
+    public function edit(Currency $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null): Response
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/DeviceController.php

@@ -79,7 +79,7 @@ class DeviceController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="device_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="device_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      *
      * @param  Device  $entity
@@ -87,9 +87,9 @@ class DeviceController extends BaseAdminController
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Device $entity, Request $request, EntityManagerInterface $em): Response
+    public function edit(Device $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null): Response
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/FootprintController.php

@@ -78,16 +78,16 @@ class FootprintController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="footprint_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="footprint_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      * @param  Footprint  $entity
      * @param  Request  $request
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Footprint $entity, Request $request, EntityManagerInterface $em)
+    public function edit(Footprint $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null)
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/ManufacturerController.php

@@ -77,16 +77,16 @@ class ManufacturerController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="manufacturer_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="manufacturer_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      * @param  Manufacturer  $entity
      * @param  Request  $request
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Manufacturer $entity, Request $request, EntityManagerInterface $em)
+    public function edit(Manufacturer $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null)
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/MeasurementUnitController.php

@@ -78,16 +78,16 @@ class MeasurementUnitController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="measurement_unit_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="measurement_unit_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      * @param  MeasurementUnit  $entity
      * @param  Request  $request
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(MeasurementUnit $entity, Request $request, EntityManagerInterface $em)
+    public function edit(MeasurementUnit $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null)
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/StorelocationController.php

@@ -76,16 +76,16 @@ class StorelocationController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="store_location_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="store_location_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      * @param  Storelocation  $entity
      * @param  Request  $request
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Storelocation $entity, Request $request, EntityManagerInterface $em)
+    public function edit(Storelocation $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null)
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/AdminPages/SupplierController.php

@@ -77,16 +77,16 @@ class SupplierController extends BaseAdminController
     }
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="supplier_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="supplier_edit")
      * @Route("/{id}", requirements={"id"="\d+"})
      * @param  Supplier  $entity
      * @param  Request  $request
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Supplier $entity, Request $request, EntityManagerInterface $em)
+    public function edit(Supplier $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null)
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/GroupController.php

@@ -67,7 +67,7 @@ class GroupController extends BaseAdminController
     protected $attachment_class = GroupAttachment::class;
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="group_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="group_edit")
      * @Route("/{id}/", requirements={"id"="\d+"})
      *
      * @param  Group  $entity
@@ -75,9 +75,9 @@ class GroupController extends BaseAdminController
      * @param  EntityManagerInterface  $em
      * @return Response
      */
-    public function edit(Group $entity, Request $request, EntityManagerInterface $em): Response
+    public function edit(Group $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null): Response
     {
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Controller/UserController.php

@@ -69,7 +69,7 @@ class UserController extends AdminPages\BaseAdminController
     protected $attachment_class = UserAttachment::class;
 
     /**
-     * @Route("/{id}/edit", requirements={"id"="\d+"}, name="user_edit")
+     * @Route("/{id}/edit/{timestamp}", requirements={"id"="\d+"}, name="user_edit")
      * @Route("/{id}/", requirements={"id"="\d+"})
      * @param  User  $entity
      * @param  Request  $request
@@ -77,7 +77,7 @@ class UserController extends AdminPages\BaseAdminController
      * @return Response
      * @throws \Exception
      */
-    public function edit(User $entity, Request $request, EntityManagerInterface $em)
+    public function edit(User $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null)
     {
         //Handle 2FA disabling
 
@@ -102,7 +102,7 @@ class UserController extends AdminPages\BaseAdminController
             }
         }
 
-        return $this->_edit($entity, $request, $em);
+        return $this->_edit($entity, $request, $em, $timestamp);
     }
 
     /**

src/Form/UserAdminForm.php

@@ -250,6 +250,13 @@ class UserAdminForm extends AbstractType
             'disabled' => ! $this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
+        $builder->add('log_comment', TextType::class, [
+            'label' => 'edit.log_comment',
+            'mapped' => false,
+            'required' => false,
+            'empty_data' => null,
+        ]);
+
         //Buttons
         $builder->add('save', SubmitType::class, [
             'label' => $is_new ? 'user.create' : 'user.edit.save',

src/Services/EntityURLGenerator.php

@@ -132,35 +132,56 @@ class EntityURLGenerator
      */
     public function timeTravelURL(AbstractDBElement $entity, \DateTime $dateTime): string
     {
-        if ($entity instanceof Part) {
+        $map = [
-            return $this->urlGenerator->generate('part_info', [
+            Part::class => 'part_info',
-                'id' => $entity->getID(),
+
-                'timestamp' => $dateTime->getTimestamp()
+            //As long we does not have own things for it use edit page
-            ]);
+            AttachmentType::class => 'attachment_type_edit',
-        }
+            Category::class => 'category_edit',
-        if ($entity instanceof PartLot) {
+            Device::class => 'device_edit',
-            return $this->urlGenerator->generate('part_info', [
+            Supplier::class => 'supplier_edit',
-                'id' => $entity->getPart()->getID(),
+            Manufacturer::class => 'manufacturer_edit',
-                'timestamp' => $dateTime->getTimestamp()
+            Storelocation::class => 'store_location_edit',
-            ]);
+            Footprint::class => 'footprint_edit',
-        }
+            User::class => 'user_edit',
-        if ($entity instanceof PartAttachment) {
+            Currency::class => 'currency_edit',
-            return $this->urlGenerator->generate('part_info', [
+            MeasurementUnit::class => 'measurement_unit_edit',
-                'id' => $entity->getElement()->getID(),
+            Group::class => 'group_edit',
-                'timestamp' => $dateTime->getTimestamp()
+        ];
-            ]);
+
-        }
+        try {
-        if ($entity instanceof Orderdetail) {
+            return $this->urlGenerator->generate(
-            return $this->urlGenerator->generate('part_info', [
+                $this->mapToController($map, $entity),
-                'id' => $entity->getPart()->getID(),
+                [
-                'timestamp' => $dateTime->getTimestamp()
+                    'id' => $entity->getID(),
-            ]);
+                    'timestamp' => $dateTime->getTimestamp()
-        }
+                ]
-        if ($entity instanceof Pricedetail) {
+            );
-            return $this->urlGenerator->generate('part_info', [
+        } catch (EntityNotSupportedException $exception) {
-                'id' => $entity->getOrderdetail()->getPart()->getID(),
+            if ($entity instanceof PartLot) {
-                'timestamp' => $dateTime->getTimestamp()
+                return $this->urlGenerator->generate('part_info', [
-            ]);
+                    'id' => $entity->getPart()->getID(),
+                    'timestamp' => $dateTime->getTimestamp()
+                ]);
+            }
+            if ($entity instanceof PartAttachment) {
+                return $this->urlGenerator->generate('part_info', [
+                    'id' => $entity->getElement()->getID(),
+                    'timestamp' => $dateTime->getTimestamp()
+                ]);
+            }
+            if ($entity instanceof Orderdetail) {
+                return $this->urlGenerator->generate('part_info', [
+                    'id' => $entity->getPart()->getID(),
+                    'timestamp' => $dateTime->getTimestamp()
+                ]);
+            }
+            if ($entity instanceof Pricedetail) {
+                return $this->urlGenerator->generate('part_info', [
+                    'id' => $entity->getOrderdetail()->getPart()->getID(),
+                    'timestamp' => $dateTime->getTimestamp()
+                ]);
+            }
         }
 
         //Otherwise throw an error

templates/AdminPages/EntityAdminBase.html.twig

@@ -1,5 +1,13 @@
 {% extends "main_card.html.twig" %}
 
+{% block card_type %}
+    {% if timeTravel is defined and timeTravel is not null %}
+        bg-primary-striped text-white
+    {% else %}
+        bg-primary text-white
+    {% endif %}
+{% endblock %}
+
 {% form_theme form.log_comment 'bootstrap_4_layout.html.twig' %}
 
 {% block card_content %}
@@ -35,10 +43,16 @@
                 <legend>
                     {% if entity.ID %}
                         <strong>{% trans with {'%name': entity.name} %}edit.caption{% endtrans %}</strong>
+                        {% if timeTravel is defined and timeTravel is not null %}
+                            ({{ timeTravel|format_datetime('short') }})
+                        {% endif %}
                     {% else %}
                         <strong>{% trans %}new.caption{% endtrans %}</strong>
                     {% endif %}
                 </legend>
+                {% if timeTravel is defined and timeTravel is not null %}
+                <b>{% trans with {'%timestamp%': timeTravel|format_datetime('short')} %}part.info.timetravel_hint{% endtrans %}</b>
+                {% endif %}
 
                 {{ form_errors(form) }}
 
@@ -78,7 +92,7 @@
                             <div class="tab-pane active" id="common">
                                 {{ form_row(form.name) }}
                                 {% if form.parent%}
-                                   {{ form_row(form.parent) }}
+                                    {{ form_row(form.parent) }}
                                 {% endif %}
                                 {% if form.not_selectable is defined %}
                                     {{ form_row(form.not_selectable) }}
@@ -87,7 +101,7 @@
                                 {% block additional_controls %}{% endblock %}
 
                                 {% block comment %}
-                                {{ form_row(form.comment) }}
+                                    {{ form_row(form.comment) }}
                                 {% endblock %}
 
                             </div>