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

Revert "Revert "move LocationRedirect changes into their targets""

Browse source 
This reverts commit 043732b88d8babafecd449a464865eb4beb86186.
This commit is contained in:
Laura Klünder 2017-06-27 19:52:21 +02:00
parent acad981b32
commit defd7b1da3
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
from c3nav.editor.models import ChangeSet
from c3nav.editor.utils import is_created_pk
from c3nav.editor.views.base import sidebar_view
from c3nav.mapdata.models.locations import LocationRedirect
from c3nav.mapdata.models.locations import LocationRedirect, LocationSlug
@sidebar_view
@ -47,7 +47,19 @@ def changeset_detail(request, pk):
changed_objects_data = []
added_redirects = {}
removed_redirects = {}
for changed_object in changeset.changed_objects.get(LocationRedirect, {}).values():
if changed_object.is_created == changed_object.deleted:
continue
values = changed_object.updated_fields
redirect_list = (removed_redirects if changed_object.deleted else added_redirects)
redirect_list.setdefault(values['target'], []).append(values['slug'])
for model, changed_objects in changeset.changed_objects.items():
if model == LocationRedirect:
continue
for pk, changed_object in changed_objects.items():
obj = objects[model][pk]
@ -153,6 +165,22 @@ def changeset_detail(request, pk):
'value': objects[field.related_model][value].title,
})
if isinstance(obj, LocationSlug):
for slug in added_redirects.get(obj.pk, ()):
changes.append({
'icon': 'chevron-right',
'class': 'info',
'title': _('Redirect slugs'),
'value': slug,
})
for slug in removed_redirects.get(obj.pk, ()):
changes.append({
'icon': 'chevron-left',
'class': 'info',
'title': _('Redirect slugs'),
'value': slug,
})
if changed_object.deleted:
changes.append({
'icon': 'minus',