From 8bec338cb1386b4e29bf2052e4d5f22fe0e0daed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Ates?= Date: Sun, 30 Nov 2014 08:32:06 +0100 Subject: [PATCH] [agenda] Fix patient display_name missing on periodic event title on periodic events page. Since commit e90f4c7328e522e3a22fea48a5c32ffefa620a9b the patient display name is not saved in the event title field anymore. Appointment building set event title with patient display_name but when an event is displayed without using appointement building step, the event type should be tested and if it is 1, event.patient.display_name must be used instead of event.title. --- calebasse/agenda/templates/agenda/periodic-events.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calebasse/agenda/templates/agenda/periodic-events.html b/calebasse/agenda/templates/agenda/periodic-events.html index f3fe5c58..a6d62c34 100644 --- a/calebasse/agenda/templates/agenda/periodic-events.html +++ b/calebasse/agenda/templates/agenda/periodic-events.html @@ -86,7 +86,7 @@ {% if event.patient %}Rendez-vous patient{% else %}Évènement{% endif %}: {{ event.recurrence_description|lower }} — {{ event.start_datetime.time }} - {% if event.title %} — {{ event.title }} {% endif %} + {% if event.patient %} — {{ event.patient.display_name }} {% else %}{% if event.title %} — {{ event.title }} {% endif %}{% endif %} {% if event.patient.paper_id %} — {{ event.patient.paper_id }} {% endif %} {% if event.length %} — {{ event.length }} min {% endif %} {% if event.workers_initial %} — {{ event.workers_initial }} {% endif %}