From 7d768875d545d6d15afc695ba050d12b2e7b89dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 25 Jun 2017 17:59:18 +0200 Subject: [PATCH] move changeset history view into changeset_detail --- src/c3nav/editor/urls.py | 5 +++-- src/c3nav/editor/views/changes.py | 20 +++++--------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/c3nav/editor/urls.py b/src/c3nav/editor/urls.py index d593d661..a774a94f 100644 --- a/src/c3nav/editor/urls.py +++ b/src/c3nav/editor/urls.py @@ -1,7 +1,7 @@ from django.apps import apps from django.conf.urls import url -from c3nav.editor.views.changes import changeset_detail, changeset_history +from c3nav.editor.views.changes import changeset_detail from c3nav.editor.views.edit import edit, level_detail, list_objects, main_index, space_detail from c3nav.editor.views.login import login_view, logout_view @@ -37,7 +37,8 @@ urlpatterns = [ url(r'^levels/(?Pc?[0-9]+)/levels_on_top/create$', edit, name='editor.levels_on_top.create', kwargs={'model': 'Level'}), url(r'^changesets/(?P[0-9]+)/$', changeset_detail, name='editor.changesets.detail'), - url(r'^changesets/(?P[0-9]+)/history$', changeset_history, name='editor.changesets.history'), + url(r'^changesets/(?P[0-9]+)/history$', changeset_detail, name='editor.changesets.history', + kwargs={'show_history': True}), url(r'^login$', login_view, name='editor.login'), url(r'^logout$', logout_view, name='editor.logout'), ] diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py index 71f5bef6..36f06f65 100644 --- a/src/c3nav/editor/views/changes.py +++ b/src/c3nav/editor/views/changes.py @@ -14,14 +14,17 @@ from c3nav.mapdata.models.locations import LocationRedirect, LocationSlug @sidebar_view -def changeset_detail(request, pk): +def changeset_detail(request, pk, show_history=False): can_edit = True changeset = request.changeset if str(pk) != str(request.changeset.pk): can_edit = False changeset = get_object_or_404(ChangeSet.qs_for_request(request), pk=pk) - ctx = group_changes(changeset, can_edit=can_edit, show_history=False) + ctx = group_changes(changeset, can_edit=can_edit, show_history=show_history) + + if show_history: + return render(request, 'editor/changeset_history.html', ctx) if request.method == 'POST': if request.POST.get('delete') == '1': @@ -38,19 +41,6 @@ def changeset_detail(request, pk): return render(request, 'editor/changeset.html', ctx) -@sidebar_view -def changeset_history(request, pk): - can_edit = True - changeset = request.changeset - if str(pk) != str(request.changeset.pk): - can_edit = False - changeset = get_object_or_404(ChangeSet.qs_for_request(request), pk=pk) - - ctx = group_changes(changeset, can_edit=can_edit, show_history=True) - - return render(request, 'editor/changeset_history.html', ctx) - - def group_changes(changeset, can_edit=False, show_history=False): changeset.parse_changes(get_history=show_history)