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

Fixed a crash in creating the family map page, and some little changes in comments.

Browse Source 
svn: r18251
This commit is contained in:
Rob G. Healey 2011-10-06 07:56:49 +00:00
parent 2f4a370ea7
commit b028d4c0e1
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/webreport/NarrativeWeb.py
View File

@ -2007,7 +2007,8 @@ class BasePage(object):
url = self.report.build_url_fname_html(spouse_handle, "ppl", True) url = self.report.build_url_fname_html(spouse_handle, "ppl", True)
tcell += self.person_link(url, spouse, _NAME_STYLE_DEFAULT, gid =gid) tcell += self.person_link(url, spouse, _NAME_STYLE_DEFAULT, gid =gid)
else: else:
reltionships tcell += self.get_name(spouse)
# display family events; such as marriage and divorce... # display family events; such as marriage and divorce...
family_events = family.get_event_ref_list() family_events = family.get_event_ref_list()
if family_events: if family_events:
@ -2836,8 +2837,8 @@ class FamilyPage(BasePage):
self.person = person self.person = person
self.place_list = place_list self.place_list = place_list
self.up = True self.up = True
birthorder = self.report.options["birthorder"] birthorder = report.options["birthorder"]
self.familymappages = self.report.options["familymappages"] self.familymappages = report.options["familymappages"]
BasePage.__init__(self, report, title, family.get_gramps_id()) BasePage.__init__(self, report, title, family.get_gramps_id())
of = self.report.create_file(family.get_handle(), "fam") of = self.report.create_file(family.get_handle(), "fam")
@ -4674,9 +4675,6 @@ class IndividualPage(BasePage):
self.name = self.get_name(person) self.name = self.get_name(person)
db = report.database db = report.database
# for use in family map pages...
self.familymappages = self.report.options["familymappages"]
of = self.report.create_file(person.get_handle(), "ppl") of = self.report.create_file(person.get_handle(), "ppl")
self.up = True self.up = True
indivdetpage, head, body = self.write_header(self.sort_name) indivdetpage, head, body = self.write_header(self.sort_name)
@ -4739,18 +4737,18 @@ class IndividualPage(BasePage):
media_list += event.get_media_list() media_list += event.get_media_list()
# display additional images as gallery # display additional images as gallery
sect7 = self.display_additional_images_as_gallery(media_list, self.person) sect7 = self.display_additional_images_as_gallery(media_list, person)
if sect7 is not None: if sect7 is not None:
individualdetail += sect7 individualdetail += sect7
# display Narrative # display Narrative Notes
notelist = person.get_note_list() notelist = person.get_note_list()
sect8 = self.display_note_list(notelist) sect8 = self.display_note_list(notelist)
if sect8 is not None: if sect8 is not None:
individualdetail += sect8 individualdetail += sect8
# display attributes # display attributes
attrlist = self.person.get_attribute_list() attrlist = person.get_attribute_list()
if attrlist: if attrlist:
attrsection, attrtable = self.display_attribute_header() attrsection, attrtable = self.display_attribute_header()
self.display_attr_list(attrlist, attrtable) self.display_attr_list(attrlist, attrtable)
@ -4762,18 +4760,18 @@ class IndividualPage(BasePage):
individualdetail += sect10 individualdetail += sect10
# display associations # display associations
assocs = self.person.get_person_ref_list() assocs = person.get_person_ref_list()
if assocs: if assocs:
individualdetail += self.display_ind_associations(assocs) individualdetail += self.display_ind_associations(assocs)
# display sources # display source references
sect11 = self.display_ind_sources(self.person) sect11 = self.display_ind_sources(person)
if sect11 is not None: if sect11 is not None:
individualdetail += sect11 individualdetail += sect11
# create family map link # for use in family map pages...
if self.familymappages: if len(place_lat_long):
if len(place_lat_long): if self.report.options["familymappages"]:
individualdetail += self.__display_family_map(person, place_lat_long) individualdetail += self.__display_family_map(person, place_lat_long)
# display pedigree # display pedigree