Fix death source references in DDR and DAR.
svn: r8590
This commit is contained in:
parent
04a41cb464
commit
5d4434fda0
@ -1,3 +1,8 @@
|
|||||||
|
2007-06-18 Brian Matherly <brian@gramps-project.org>
|
||||||
|
* src/plugins/DetDescendantReport.py:
|
||||||
|
* src/plugins/DetAncestralReport.py:
|
||||||
|
Fix death source reference.
|
||||||
|
|
||||||
2007-06-18 Brian Matherly <brian@gramps-project.org>
|
2007-06-18 Brian Matherly <brian@gramps-project.org>
|
||||||
* src/DbManager.py: make path recursive. Make default db dir consistent.
|
* src/DbManager.py: make path recursive. Make default db dir consistent.
|
||||||
|
|
||||||
|
@ -246,7 +246,7 @@ class DetAncestorReport(Report):
|
|||||||
text = ReportUtils.died_str(self.database,person,first,
|
text = ReportUtils.died_str(self.database,person,first,
|
||||||
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
||||||
if text:
|
if text:
|
||||||
death_ref = person.get_birth_ref()
|
death_ref = person.get_death_ref()
|
||||||
if death_ref:
|
if death_ref:
|
||||||
death = self.database.get_event_from_handle(death_ref.ref)
|
death = self.database.get_event_from_handle(death_ref.ref)
|
||||||
text = text.rstrip(". ")
|
text = text.rstrip(". ")
|
||||||
@ -355,7 +355,7 @@ class DetAncestorReport(Report):
|
|||||||
'event_name' : _(evtName),
|
'event_name' : _(evtName),
|
||||||
'date' : date}
|
'date' : date}
|
||||||
elif place:
|
elif place:
|
||||||
text += _('%(event_name)s: %(place)s%') % {
|
text += _('%(event_name)s: %(place)s') % {
|
||||||
'event_name' : _(evtName),
|
'event_name' : _(evtName),
|
||||||
'place' : place }
|
'place' : place }
|
||||||
else:
|
else:
|
||||||
|
@ -273,7 +273,7 @@ class DetDescendantReport(Report):
|
|||||||
text = ReportUtils.died_str(self.database,person,first,
|
text = ReportUtils.died_str(self.database,person,first,
|
||||||
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
|
||||||
if text:
|
if text:
|
||||||
death_ref = person.get_birth_ref()
|
death_ref = person.get_death_ref()
|
||||||
if death_ref:
|
if death_ref:
|
||||||
death = self.database.get_event_from_handle(death_ref.ref)
|
death = self.database.get_event_from_handle(death_ref.ref)
|
||||||
text = text.rstrip(". ")
|
text = text.rstrip(". ")
|
||||||
@ -382,7 +382,7 @@ class DetDescendantReport(Report):
|
|||||||
'event_name' : _(evtName),
|
'event_name' : _(evtName),
|
||||||
'date' : date}
|
'date' : date}
|
||||||
elif place:
|
elif place:
|
||||||
text += _('%(event_name)s: %(place)s%') % {
|
text += _('%(event_name)s: %(place)s') % {
|
||||||
'event_name' : _(evtName),
|
'event_name' : _(evtName),
|
||||||
'place' : place }
|
'place' : place }
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user