2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

unreject

Browse source
This commit is contained in:
Laura Klünder 2017-07-05 20:32:43 +02:00
parent 2426ff7021
commit c3cd312114
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/editor/templates/editor/changeset.html
View file

@ -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 %}

11
src/c3nav/editor/views/changes.py
View file

@ -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