Skip to content

Commit 6f9d3f5

Browse files
committed
Render a single day event's year once
1 parent e4407b4 commit 6f9d3f5

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎apps/events/templates/events/includes/time_tag.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
{{ next_time.dt_start|date:"Y" }}
55
</span>
66

7-
<span id="start-{{ object.id }}"{% if scheduled_end_this_year %} class="say-no-more"{% endif %}>
8-
{{ next_time.dt_start|date:"Y" }}
9-
</span>
10-
117
{% if not next_time.all_day %}
128
{{ next_time.dt_start|date:"fA"|lower }} {{ next_time.dt_start|date:"e" }}
139
{% if next_time.valid_dt_end %} – {{ next_time.dt_end|date:"fA"|lower }}

‎apps/events/tests/test_views.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,13 @@ def test_event_ending_future_year_displays_relevant_year(self):
233233
response = self.client.get(url)
234234
self.assertIn(f'<span id="end-{event.id}">', response.content.decode())
235235

236+
def test_single_day_event_renders_its_year_once(self):
237+
"""A single day event rendered the same start year twice. See #2626."""
238+
event = self.event_single_day
239+
response = self.client.get(reverse("events:events"))
240+
241+
self.assertEqual(response.content.decode().count(f'id="start-{event.id}"'), 1)
242+
236243
def test_events_scheduled_current_year_does_not_display_current_year(self):
237244
event = self.event_single_day
238245
url = reverse("events:events")

0 commit comments

Comments
 (0)