Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9284: Narrative Report with BSDDB

Browse Source
This commit is contained in:
Doug Blank 2016-03-02 08:36:02 -06:00
parent f218ab0cd7
commit 7dca404669
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gramps/plugins/webreport/narrativeweb.py
View File

@ -494,7 +494,7 @@ def get_gendex_data(database, event_ref):
""" """
doe = "" # date of event doe = "" # date of event
poe = "" # place of event poe = "" # place of event
if event_ref: if event_ref and event_ref.ref:
event = database.get_event_from_handle(event_ref.ref) event = database.get_event_from_handle(event_ref.ref)
if event: if event:
date = event.get_date_object() date = event.get_date_object()
@ -1132,10 +1132,17 @@ class BasePage(object):
husband, spouse = [False]*2 husband, spouse = [False]*2
husband_handle = family.get_father_handle() husband_handle = family.get_father_handle()
spouse_handle = family.get_mother_handle()
husband = self.dbase_.get_person_from_handle(husband_handle) if husband_handle:
spouse = self.dbase_.get_person_from_handle(spouse_handle) husband = self.database.get_person_from_handle(husband_handle)
else:
husband = None
spouse_handle = family.get_mother_handle()
if spouse_handle:
spouse = self.database.get_person_from_handle(spouse_handle)
else:
spouse = None
if husband: if husband:
husband_name = self.get_name(husband) husband_name = self.get_name(husband)
@ -7476,8 +7483,14 @@ class NavWebReport(Report):
husband_handle = family.get_father_handle() husband_handle = family.get_father_handle()
spouse_handle = family.get_mother_handle() spouse_handle = family.get_mother_handle()
if husband_handle:
husband = self.database.get_person_from_handle(husband_handle) husband = self.database.get_person_from_handle(husband_handle)
else:
husband = None
if spouse_handle:
spouse = self.database.get_person_from_handle(spouse_handle) spouse = self.database.get_person_from_handle(spouse_handle)
else:
spouse = None
if husband and spouse: if husband and spouse:
husband_name = self.get_person_name(husband) husband_name = self.get_person_name(husband)