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

show discarded changes in changeset view in gray

Browse source
This commit is contained in:
Laura Klünder 2017-06-21 13:17:52 +02:00
parent 1d3345b78e
commit e54516ff41
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@
{% for change in group.changes %} {% for change in group.changes %}
<tr> <tr>
<td class="text-{{ change.class }}"><i class="glyphicon glyphicon-{{ change.icon }}"></i></td> <td class="text-{{ change.class }}"><i class="glyphicon glyphicon-{{ change.icon }}"></i></td>
<td> <td{% if change.discarded %} class="text-muted"{% endif %}>
{% if change.value %}<u>{% else %}<em>{% endif %}{{ change.title }}{% if change.value %}</u>:{% else %}</em>{% endif %} {% if change.value %}<u>{% else %}<em>{% endif %}{{ change.title }}{% if change.value %}</u>:{% else %}</em>{% endif %}
{{ change.value }} {{ change.value }}
</td> </td>

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

@ -152,6 +152,7 @@ def group_changes(changeset, can_edit=False, show_history=False):
'pk': change.pk, 'pk': change.pk,
'author': change.author, 'author': change.author,
'created': _('created at %(datetime)s') % {'datetime': date_format(change.created, 'DATETIME_FORMAT')}, 'created': _('created at %(datetime)s') % {'datetime': date_format(change.created, 'DATETIME_FORMAT')},
'discarded': change.discarded_by_id is not None,
} }
changes.append(change_data) changes.append(change_data)
if change.action == 'create': if change.action == 'create':