2753: Detailed reports did not use probably_alive for child text
svn: r12202
This commit is contained in:
		@@ -46,6 +46,7 @@ from ReportBase import Bibliography, Endnotes
 | 
			
		||||
import BaseDoc
 | 
			
		||||
import DateHandler
 | 
			
		||||
from BasicUtils import name_displayer as _nd
 | 
			
		||||
import Utils
 | 
			
		||||
 | 
			
		||||
#------------------------------------------------------------------------
 | 
			
		||||
#
 | 
			
		||||
@@ -452,9 +453,9 @@ class DetAncestorReport(Report):
 | 
			
		||||
            else:
 | 
			
		||||
                father_name = ""
 | 
			
		||||
                father_mark = ""
 | 
			
		||||
                
 | 
			
		||||
            alive = Utils.probably_alive(person, self.database)
 | 
			
		||||
            text = ReportUtils.child_str(person, father_name, mother_name,
 | 
			
		||||
                                         bool(person.get_death_ref()),
 | 
			
		||||
                                         not alive,
 | 
			
		||||
                                         firstName,self.verbose)
 | 
			
		||||
            if text:
 | 
			
		||||
                self.doc.write_text(text)
 | 
			
		||||
 
 | 
			
		||||
@@ -47,6 +47,7 @@ from ReportBase import Bibliography, Endnotes
 | 
			
		||||
import BaseDoc
 | 
			
		||||
import DateHandler
 | 
			
		||||
from BasicUtils import name_displayer as _nd
 | 
			
		||||
import Utils
 | 
			
		||||
 | 
			
		||||
#------------------------------------------------------------------------
 | 
			
		||||
#
 | 
			
		||||
@@ -360,9 +361,9 @@ class DetDescendantReport(Report):
 | 
			
		||||
            else:
 | 
			
		||||
                father_name = ""
 | 
			
		||||
                father_mark = ""
 | 
			
		||||
                
 | 
			
		||||
            alive = Utils.probably_alive(person, self.database)
 | 
			
		||||
            text = ReportUtils.child_str(person, father_name, mother_name,
 | 
			
		||||
                                         bool(person.get_death_ref()),
 | 
			
		||||
                                         not alive,
 | 
			
		||||
                                         firstName,self.verbose)
 | 
			
		||||
            if text:
 | 
			
		||||
                self.doc.write_text(text)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user