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

move created by text into template

Browse source
This commit is contained in:
Laura Klünder 2017-06-29 18:36:04 +02:00
parent 306e4e8ec9
commit 3e1e8f29f7
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/c3nav/editor/templates/editor/changeset.html
View file

@ -14,9 +14,15 @@
<form method="post" action="{{ request.path }}">
{% csrf_token %}
<p class="text-muted">
{{ created }}{% if changeset.author %} {{ changeset.author.username }}{% endif %}
{% with datetime=changeset.created|date:"DATETIME_FORMAT" author=changeset.author %}
{% if author %}
{% blocktrans %}created at {{ datetime }} by {{ author }}{% endblocktrans %}
{% else %}
{% blocktrans %}created at {{ datetime }}{% endblocktrans %}
{% endif %}
{% endwith %}
{% if changeset.proposed %}
<br>{% with date=changeset.proposed|date:"DATETIME_FORMAT" %}{% blocktrans %}proposed at {{ date }}{% endblocktrans %}{% endwith %}
<br>{% with datetime=changeset.proposed|date:"DATETIME_FORMAT" %}{% blocktrans %}proposed at {{ datetime }}{% endblocktrans %}{% endwith %}
{% endif %}
</p>
{% bootstrap_messages %}

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

@ -8,7 +8,6 @@ from django.http import Http404
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils import timezone
from django.utils.formats import date_format
from django.utils.translation import ugettext_lazy as _
from c3nav.editor.forms import ChangeSetForm
@ -250,14 +249,8 @@ def changeset_detail(request, pk):
changed_objects_data = sorted(changed_objects_data, key=itemgetter('order'))
if changeset.author:
created = _('created at %(datetime)s by') % {'datetime': date_format(changeset.created, 'DATETIME_FORMAT')}
else:
created = _('created at %(datetime)s') % {'datetime': date_format(changeset.created, 'DATETIME_FORMAT')}
ctx = {
'changeset': changeset,
'created': created,
'can_edit': can_edit,
'can_delete': can_delete,
'can_unpropose': changeset.can_unpropose(request),