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

9293: Narrative Web report further stops in error.

Browse Source
This commit is contained in:
SNoiraud 2016-03-06 13:04:51 +01:00
parent 7f5d4fb10f
commit 1cfd71001c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,7 +702,9 @@ class BasePage(object):
with Html("table", class_ = table_class) as table: with Html("table", class_ = table_class) as table:
section += table section += table
for person_handle in [family.get_father_handle(), family.get_mother_handle()]: for person_handle in [family.get_father_handle(), family.get_mother_handle()]:
person = self.dbase_.get_person_from_handle(person_handle) person = None
if person_handle:
person = self.dbase_.get_person_from_handle(person_handle)
if person: if person:
table += self.display_spouse(person, family, place_lat_long) table += self.display_spouse(person, family, place_lat_long)
@ -3030,12 +3032,15 @@ class SurnamePage(BasePage):
family = self.dbase_.get_family_from_handle(parent_handle) family = self.dbase_.get_family_from_handle(parent_handle)
father_id = family.get_father_handle() father_id = family.get_father_handle()
mother_id = family.get_mother_handle() mother_id = family.get_mother_handle()
father = self.dbase_.get_person_from_handle(father_id) mother = father = None
mother = self.dbase_.get_person_from_handle(mother_id) if father_id:
if father: father = self.dbase_.get_person_from_handle(father_id)
father_name = self.get_name(father) if father:
if mother: father_name = self.get_name(father)
mother_name = self.get_name(mother) if mother_id:
mother = self.dbase_.get_person_from_handle(mother_id)
if mother:
mother_name = self.get_name(mother)
if mother and father: if mother and father:
tcell = Html("span", father_name, class_ = "father fatherNmother") tcell = Html("span", father_name, class_ = "father fatherNmother")
tcell += Html("span", mother_name, class_ = "mother") tcell += Html("span", mother_name, class_ = "mother")