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

move changeset history view into changeset_detail

Browse source
This commit is contained in:
Laura Klünder 2017-06-25 17:59:18 +02:00
parent 0a3675b9ef
commit 7d768875d5
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/editor/urls.py
View file

@ -1,7 +1,7 @@
from django.apps import apps from django.apps import apps
from django.conf.urls import url 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.edit import edit, level_detail, list_objects, main_index, space_detail
from c3nav.editor.views.login import login_view, logout_view from c3nav.editor.views.login import login_view, logout_view
@ -37,7 +37,8 @@ urlpatterns = [
url(r'^levels/(?P<on_top_of>c?[0-9]+)/levels_on_top/create$', edit, name='editor.levels_on_top.create', url(r'^levels/(?P<on_top_of>c?[0-9]+)/levels_on_top/create$', edit, name='editor.levels_on_top.create',
kwargs={'model': 'Level'}), kwargs={'model': 'Level'}),
url(r'^changesets/(?P<pk>[0-9]+)/$', changeset_detail, name='editor.changesets.detail'), url(r'^changesets/(?P<pk>[0-9]+)/$', changeset_detail, name='editor.changesets.detail'),
url(r'^changesets/(?P<pk>[0-9]+)/history$', changeset_history, name='editor.changesets.history'), url(r'^changesets/(?P<pk>[0-9]+)/history$', changeset_detail, name='editor.changesets.history',
kwargs={'show_history': True}),
url(r'^login$', login_view, name='editor.login'), url(r'^login$', login_view, name='editor.login'),
url(r'^logout$', logout_view, name='editor.logout'), url(r'^logout$', logout_view, name='editor.logout'),
] ]

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

@ -14,14 +14,17 @@ from c3nav.mapdata.models.locations import LocationRedirect, LocationSlug
@sidebar_view @sidebar_view
def changeset_detail(request, pk): def changeset_detail(request, pk, show_history=False):
can_edit = True can_edit = True
changeset = request.changeset changeset = request.changeset
if str(pk) != str(request.changeset.pk): if str(pk) != str(request.changeset.pk):
can_edit = False can_edit = False
changeset = get_object_or_404(ChangeSet.qs_for_request(request), pk=pk) 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.method == 'POST':
if request.POST.get('delete') == '1': if request.POST.get('delete') == '1':
@ -38,19 +41,6 @@ def changeset_detail(request, pk):
return render(request, 'editor/changeset.html', ctx) 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): def group_changes(changeset, can_edit=False, show_history=False):
changeset.parse_changes(get_history=show_history) changeset.parse_changes(get_history=show_history)