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

src/plugins/FamilyGroup.py: Fix for Event and EventType changes.

Browse Source 
svn: r6661
This commit is contained in:
Brian Matherly 2006-05-15 01:29:44 +00:00
parent 8cb771c5d1
commit fccd0c3db1
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/ChangeLog
View File

@ -1,6 +1,7 @@
2006-05-14 Brian Matherly <brian@gramps-project.org> 2006-05-14 Brian Matherly <brian@gramps-project.org>
* src/PluginUtils/_ReportUtils.py: Change strings to include gender instead * src/PluginUtils/_ReportUtils.py: Change strings to include gender instead
of "child of" of "child of"
* src/plugins/FamilyGroup.py: Fix for Event and EventType changes.
2006-05-14 Don Allingham <don@gramps-project.org> 2006-05-14 Don Allingham <don@gramps-project.org>
* src/DateHandler/__init__.py: import DateParser and DateDisplay * src/DateHandler/__init__.py: import DateParser and DateDisplay

24
gramps2/src/plugins/FamilyGroup.py
View File

@ -281,7 +281,7 @@ class FamilyGroup(Report.Report):
for event_ref in person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref) event = self.database.get_event_from_handle(event_ref.ref)
evtType = event.get_type() evtType = event.get_type()
name = Utils.format_event( evtType ) name = str( evtType )
self.dump_parent_event(name,event) self.dump_parent_event(name,event)
if self.incParAddr: if self.incParAddr:
@ -361,17 +361,15 @@ class FamilyGroup(Report.Report):
return return
m = None m = None
family_list = family.get_event_list() family_list = family.get_event_ref_list()
for event_handle in family_list: for event_ref in family_list:
if event_handle: if event_ref:
event = self.database.get_event_from_handle(event_handle) event = self.database.get_event_from_handle(event_ref.ref)
if event.get_name() == "Marriage": if event.get_type() == RelLib.EventType.MARRIAGE:
m = event m = event
break break
if len(family_list) > 0 or self.missingInfo: if len(family_list) > 0 or self.missingInfo:
self.doc.start_table(("MarriageInfo"),'FGR-ParentTable') self.doc.start_table(("MarriageInfo"),'FGR-ParentTable')
self.doc.start_row() self.doc.start_row()
self.doc.start_cell('FGR-ParentHead',3) self.doc.start_cell('FGR-ParentHead',3)
@ -383,11 +381,11 @@ class FamilyGroup(Report.Report):
self.dump_parent_event(_("Marriage"),m) self.dump_parent_event(_("Marriage"),m)
for event_handle in family_list: for event_ref in family_list:
if event_handle: if event_ref:
event = self.database.get_event_from_handle(event_handle) event = self.database.get_event_from_handle(event_ref.ref)
if event.get_name() != "Marriage": if event.get_type() != RelLib.EventType.MARRIAGE:
self.dump_parent_event(event.get_name(),event) self.dump_parent_event(str(event.get_type()),event)
self.doc.end_table() self.doc.end_table()