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

move delete before group_changes, too

Browse source
This commit is contained in:
Laura Klünder 2017-06-25 18:27:44 +02:00
parent 3597abc632
commit fc873d990c
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,25 +31,22 @@ def changeset_detail(request, pk, show_history=False):
return render(request, 'editor/changeset_restore_confirm.html', {'pk': change.pk}) return render(request, 'editor/changeset_restore_confirm.html', {'pk': change.pk})
change.restore(request.user if request.user.is_authenticated else None) change.restore(request.user if request.user.is_authenticated else None)
messages.success(request, _('Original state has been restored!')) messages.success(request, _('Original state has been restored!'))
return redirect(request.path)
if not show_history and request.POST.get('delete') == '1':
if request.POST.get('delete_confirm') == '1':
changeset.delete()
return redirect(reverse('editor.index'))
return render(request, 'editor/delete.html', {
'model_title': ChangeSet._meta.verbose_name,
'obj_title': changeset.title,
})
ctx = group_changes(changeset, can_edit=can_edit, show_history=show_history) ctx = group_changes(changeset, can_edit=can_edit, show_history=show_history)
if show_history: if show_history:
return render(request, 'editor/changeset_history.html', ctx) return render(request, 'editor/changeset_history.html', ctx)
if request.method == 'POST':
if request.POST.get('delete') == '1':
if request.POST.get('delete_confirm') == '1':
changeset.delete()
return redirect(reverse('editor.index'))
ctx.update({
'model_title': ChangeSet._meta.verbose_name,
'obj_title': changeset.title,
})
return render(request, 'editor/delete.html', ctx)
return render(request, 'editor/changeset.html', ctx) return render(request, 'editor/changeset.html', ctx)