From aac19c3b310e5ec21d4ecbadb22517ec4c58ed21 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Tue, 13 Apr 2010 02:37:08 +0000 Subject: [PATCH] 3834: Death date on individuals an surnames pages in Narrative Web Report svn: r15098 --- src/plugins/webreport/NarrativeWeb.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 0f2d38c13..4477ebaaf 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1911,7 +1911,7 @@ class IndividualListPage(BasePage): death_date = _find_death_date(db, person) if death_date is not None: - tcell += death_date + tcell += _dd.display(death_date) else: tcell += " " @@ -2072,7 +2072,7 @@ class SurnamePage(BasePage): death_date = _find_death_date(db, person) if death_date is not None: - tcell += death_date + tcell += _dd.display(death_date) else: tcell += " " @@ -6198,7 +6198,8 @@ def _find_death_date(db, person): death_ref = person.get_death_ref() if death_ref: death = db.get_event_from_handle(death_ref.ref) - return death.get_date_object() + if death: + return death.get_date_object() else: event_list = person.get_primary_event_ref_list() for event_ref in event_list: