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

Contribution from Robert Cawley <rjc@cawley.id.au>: Invalid output when duplicate persons detected in Detailed descendant report(#0001124)

Browse Source 
svn: r8769
This commit is contained in:
Brian Matherly 2007-07-24 11:53:35 +00:00
parent 9d843c2f80
commit 5de7e777cc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-07-24 Robert Cawley <rjc@cawley.id.au>
* src/plugins/DetDescendantReport.py: Invalid output when duplicate persons
detected in Detailed descendant report (#0001124)
2007-07-23 Johan Gonqvist <johan.gronqvist@gmail.com> 2007-07-23 Johan Gonqvist <johan.gronqvist@gmail.com>
* src/plugins/NarrativeWeb.py: * src/plugins/NarrativeWeb.py:
NarrativeWeb links incorrect in windows. (#0001117) NarrativeWeb links incorrect in windows. (#0001117)

6
src/plugins/DetDescendantReport.py
View File

@ -4,6 +4,7 @@
# Copyright (C) 2000-2002 Bruce J. DeGrasse # Copyright (C) 2000-2002 Bruce J. DeGrasse
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# Copyright (C) 2007 Brian G. Matherly # Copyright (C) 2007 Brian G. Matherly
# Copyright (C) 2007 Robert Cawley <rjc@cawley.id.au>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -231,7 +232,6 @@ class DetDescendantReport(Report):
else: else:
self.doc.write_text("%s. " % self.endnotes(person)) self.doc.write_text("%s. " % self.endnotes(person))
self.doc.end_bold() self.doc.end_bold()
self.doc.end_paragraph()
if self.dupPerson: if self.dupPerson:
# Check for duplicate record (result of distant cousins marrying) # Check for duplicate record (result of distant cousins marrying)
@ -245,7 +245,9 @@ class DetDescendantReport(Report):
{ 'name' : '', 'id_str' : str(dkey) }) { 'name' : '', 'id_str' : str(dkey) })
self.doc.end_paragraph() self.doc.end_paragraph()
return return
self.doc.end_paragraph()
self.write_person_info(person) self.write_person_info(person)
if self.listChildren or self.includeEvents or self.includeMates: if self.listChildren or self.includeEvents or self.includeMates: