From 3b50c6f9dd2be0098b04b29bca79c95042489159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Fri, 29 Nov 2024 17:09:38 +0100
Subject: [PATCH] bring changeset restore object feature back to life

---
 .../editor/templates/editor/changeset.html    |  2 +-
 src/c3nav/editor/views/changes.py             | 38 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 700c3e3b..03a89ec0 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -91,7 +91,7 @@
                             {% trans 'Edit' %}
                         </a>
                     {% elif obj.deleted and can_edit and not obj.missing_dependencies and not obj.unique_collisions %}
-                        <button type="submit" name="restore" value="{{ obj.pk }}" class="btn btn-warning btn-xs pull-right">
+                        <button type="submit" name="restore" value="{{ obj.model_name }}-{{ obj.pk }}" class="btn btn-warning btn-xs pull-right">
                             {% trans 'Restore' %}
                         </button>
                     {% endif %}
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index e3f60f45..e8956879 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -38,26 +38,21 @@ def changeset_detail(request, pk):
     can_delete = changeset.can_delete(request)
 
     if request.method == 'POST':
-        restore = request.POST.get('restore')
-        if restore and restore.isdigit():
-            raise NotImplementedError  # todo: restore (no pun intended) this feature
-            # if request.changeset.can_edit(request):
-            #     try:
-            #         changed_object = changeset.changed_objects_set.get(pk=restore)
-            #     except Exception:
-            #         pass
-            #     else:
-            #         try:
-            #             changed_object.restore()
-            #             messages.success(request, _('Object has been successfully restored.'))
-            #         except PermissionError:
-            #             messages.error(request, _('You cannot restore this object, because it depends on '
-            #                                       'a deleted object or it would violate a unique contraint.'))
-            #
-            # else:
-            #     messages.error(request, _('You can not edit changes on this change set.'))
-            #
-            # return redirect(reverse('editor.changesets.detail', kwargs={'pk': changeset.pk}))
+        restore_model, restore_id = (request.POST.get('restore')+'-').split('-')[:2]
+        if restore_model and restore_id and restore_id.isdigit():
+            if request.changeset.can_edit(request):
+                changed_object = changeset.changes.objects.get(restore_model, {}).get(restore_id)
+                if changed_object is None:
+                    messages.error(request, _("Can't find this changed object"))
+                elif not changed_object.deleted:
+                    messages.error(request, _("Can't restore this object because it wasn't deleted"))
+                else:
+                    changed_object.deleted = False
+                    messages.success(request, _('Object has been successfully restored.'))
+            else:
+                messages.error(request, _('You can not edit changes on this change set.'))
+
+            return redirect(reverse('editor.changesets.detail', kwargs={'pk': changeset.pk}))
 
         elif request.POST.get('activate') == '1':
             with changeset.lock_to_edit(request) as changeset:
@@ -72,7 +67,7 @@ def changeset_detail(request, pk):
         elif request.POST.get('propose') == '1':
             if not request.user.is_authenticated:
                 messages.info(request, _('You need to log in to propose changes.'))
-                return redirect(reverse('editor.login')+'?r='+request.path)
+                return redirect(reverse('editor.login') + '?r=' + request.path)
 
             with changeset.lock_to_edit(request) as changeset:
                 if not changeset.title or not changeset.description:
@@ -242,6 +237,7 @@ def changeset_detail(request, pk):
 
         changed_object_data = {
             'model': model,
+            'model_name': model._meta.model_name,
             'model_title': model._meta.verbose_name,
             'pk': changed_object.obj.id,
             'desc': format_lazy(_('{model} #{id}'), model=model._meta.verbose_name, id=changed_object.obj.id),