From c3cd3121144591416f8d8fe906d4ce504efd105e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Wed, 5 Jul 2017 20:32:43 +0200
Subject: [PATCH] unreject

---
 src/c3nav/editor/templates/editor/changeset.html |  2 +-
 src/c3nav/editor/views/changes.py                | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 15625390..bbb1ce34 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -142,7 +142,7 @@
                 <button type="submit" class="btn btn-success" name="apply" value="1">{% trans 'Apply' %}</button>
             {% endif %}
             {% if can_unreject %}
-                <button type="submit" class="btn btn-default" name="reject" value="1">{% trans 'Unreject' %}</button>
+                <button type="submit" class="btn btn-default" name="unreject" value="1">{% trans 'Unreject' %}</button>
             {% endif %}
         {% endif %}
         {% if not active and not changeset.closed %}
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index cbd89eda..48ceeeb6 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -115,6 +115,17 @@ def changeset_detail(request, pk):
 
             return redirect(reverse('editor.changesets.detail', kwargs={'pk': changeset.pk}))
 
+        elif request.POST.get('unreject') == '1':
+            with changeset.lock_to_edit() as changeset:
+                if not changeset.can_unreject(request):
+                    messages.error(request, _('You cannot unreject these changes.'))
+                    return redirect(reverse('editor.changesets.detail', kwargs={'pk': changeset.pk}))
+
+                changeset.unreject(request.user)
+                messages.success(request, _('You unrejected these changes.'))
+
+            return redirect(reverse('editor.changesets.detail', kwargs={'pk': changeset.pk}))
+
         elif request.POST.get('delete') == '1':
             if not changeset.can_delete(request):
                 raise PermissionDenied