kopia lustrzana https://github.com/wagtail/wagtail
Correctly output Draft vs Published when no revisions exist
Fixes #6324 Also removed repeated calls to page.get_latest_revision.pull/6355/head
rodzic
3c4349cf7e
commit
8e44476e4f
|
@ -21,18 +21,24 @@
|
||||||
</li>
|
</li>
|
||||||
{% else %}
|
{% else %}
|
||||||
<li class="header-meta--status">
|
<li class="header-meta--status">
|
||||||
{% if page.get_latest_revision %}
|
{% with latest_revision=page.get_latest_revision %}
|
||||||
{% if page.get_latest_revision.user %}
|
{% if latest_revision %}
|
||||||
<span class="avatar small" data-wagtail-tooltip="{{ page.get_latest_revision.user.get_full_name|default:page.get_latest_revision.user.get_username }}"><img src="{% avatar_url page.get_latest_revision.user size=25 %}" alt="" /></span>
|
{% if latest_revision.user %}
|
||||||
{% endif %}
|
<span class="avatar small" data-wagtail-tooltip="{{ latest_revision.user.get_full_name|default:latest_revision.user.get_username }}"><img src="{% avatar_url latest_revision.user size=25 %}" alt="" /></span>
|
||||||
{% if page.get_latest_revision == page.live_revision %}
|
{% endif %}
|
||||||
{% trans "Published" %}
|
{% if latest_revision == page.live_revision %}
|
||||||
|
{% trans "Published" %}
|
||||||
|
{% else %}
|
||||||
|
{% trans "Draft saved" %}
|
||||||
|
{% endif %}
|
||||||
|
{% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_revision.created_at time_prefix="at" %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% trans "Draft saved" %}
|
{% if page.live %}
|
||||||
|
{% trans "Published" %}
|
||||||
|
{% else %}
|
||||||
|
{% trans "Draft" %}
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include "wagtailadmin/shared/last_updated.html" with last_updated=page.get_latest_revision.created_at time_prefix="at" %}
|
{% endwith %}
|
||||||
{% else %}
|
|
||||||
{% trans "Draft" %}
|
|
||||||
{% endif %}
|
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -83,6 +83,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
|
||||||
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )))
|
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertEqual(response['Content-Type'], "text/html; charset=utf-8")
|
self.assertEqual(response['Content-Type'], "text/html; charset=utf-8")
|
||||||
|
self.assertContains(response, '<li class="header-meta--status">Published</li>', html=True)
|
||||||
|
|
||||||
# Test InlinePanel labels/headings
|
# Test InlinePanel labels/headings
|
||||||
self.assertContains(response, '<legend>Speaker lineup</legend>')
|
self.assertContains(response, '<legend>Speaker lineup</legend>')
|
||||||
|
@ -101,6 +102,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
|
||||||
# Tests that the edit page loads
|
# Tests that the edit page loads
|
||||||
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.unpublished_page.id, )))
|
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.unpublished_page.id, )))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
|
self.assertContains(response, '<li class="header-meta--status">Draft</li>', html=True)
|
||||||
|
|
||||||
def test_edit_multipart(self):
|
def test_edit_multipart(self):
|
||||||
"""
|
"""
|
||||||
|
|
Ładowanie…
Reference in New Issue