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

* src/plugins/DetAncestralReport.py (write_children):

Browse Source 
Check whether event exists (#1014414).
* src/plugins/IndivComplete.py (write_alt_names): Correct the
use of handle (#1014411); (write_fact, write_sources, write_person):
Use gramps id, not handle, for displaying source references.


svn: r3488
This commit is contained in:
Alex Roitman 2004-08-23 16:59:13 +00:00
parent ab83541b89
commit 934a763ae2
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -3,6 +3,12 @@
* src/NameEdit.py: Proper use of ComboBoxEntry widgets (#1014238). * src/NameEdit.py: Proper use of ComboBoxEntry widgets (#1014238).
* src/EdirPerson.py (__init__): Use handle instead of ID (#1014224). * src/EdirPerson.py (__init__): Use handle instead of ID (#1014224).
* src/plugins/DetAncestralReport.py (write_children):
Check whether event exists (#1014414).
* src/plugins/IndivComplete.py (write_alt_names): Correct the
use of handle (#1014411); (write_fact, write_sources, write_person):
Use gramps id, not handle, for displaying source references.
2004-08-23 Tim Waugh <twaugh@redhat.com> 2004-08-23 Tim Waugh <twaugh@redhat.com>
* install-sh: Removed this generated file. * install-sh: Removed this generated file.

4
src/plugins/DetAncestralReport.py
View File

@ -221,7 +221,7 @@ class DetAncestorReport(Report.Report):
else: else:
self.doc.write_text(_("- %s Died: %s") % \ self.doc.write_text(_("- %s Died: %s") % \
(name, death.get_date())) # 2 (name, death.get_date())) # 2
elif death.get_place_handle(): elif death and death.get_place_handle():
dplace = self.database.get_place_from_handle(death.get_place_handle()).get_title() dplace = self.database.get_place_from_handle(death.get_place_handle()).get_title()
self.doc.write_text(_("- %s Died: %s") % \ self.doc.write_text(_("- %s Died: %s") % \
(name, dplace)) # 1 (name, dplace)) # 1
@ -270,7 +270,7 @@ class DetAncestorReport(Report.Report):
if birth_handle: if birth_handle:
self.write_birth(person, rptOptions) self.write_birth(person, rptOptions)
if person.get_death_handle(): if person.get_death_handle():
self.write_death(person, firstName, rptOptions) self.write_death(person, firstName, rptOptions)
self.write_parents(person, firstName) self.write_parents(person, firstName)
self.write_marriage(person, rptOptions) self.write_marriage(person, rptOptions)
self.doc.end_paragraph() self.doc.end_paragraph()

20
src/plugins/IndivComplete.py
View File

@ -145,9 +145,9 @@ class IndivComplete(Report.Report):
self.normal_cell(name) self.normal_cell(name)
if self.use_srcs: if self.use_srcs:
for s in event.get_source_references(): for s in event.get_source_references():
#src_id = s.get_base_handle() src_handle = s.get_base_handle()
#src = self.database.find_source_from_handle(src_id) src = self.database.get_source_from_handle(src_handle)
text = "%s [%s]" % (text,s.get_base_handle()) text = "%s [%s]" % (text,src.get_gramps_id())
self.slist.append(s) self.slist.append(s)
self.normal_cell(text) self.normal_cell(text)
self.d.end_row() self.d.end_row()
@ -249,7 +249,9 @@ class IndivComplete(Report.Report):
text = name.get_regular_name() text = name.get_regular_name()
if self.use_srcs: if self.use_srcs:
for s in name.get_source_references(): for s in name.get_source_references():
text = "%s [%s]" % (text,s.get_base_handle().get_handle()) src_handle = s.get_base_handle()
src = self.database.get_source_from_handle(src_handle)
text = "%s [%s]" % (text,src.get_gramps_id())
self.slist.append(s) self.slist.append(s)
self.normal_cell(text) self.normal_cell(text)
self.d.end_row() self.d.end_row()
@ -334,9 +336,9 @@ class IndivComplete(Report.Report):
for source in self.slist: for source in self.slist:
self.d.start_row() self.d.start_row()
s_id = source.get_base_handle() s_handle = source.get_base_handle()
self.normal_cell(s_id) src = self.database.get_source_from_handle(s_handle)
src = self.database.get_source_from_handle(s_id) self.normal_cell(src.get_gramps_id())
self.normal_cell(src.get_title()) self.normal_cell(src.get_title())
self.d.end_row() self.d.end_row()
self.d.end_table() self.d.end_table()
@ -418,7 +420,9 @@ class IndivComplete(Report.Report):
if self.use_srcs: if self.use_srcs:
for s in name.get_source_references(): for s in name.get_source_references():
self.slist.append(s) self.slist.append(s)
text = "%s [%s]" % (text,s.get_base_handle()) src_handle = s.get_base_handle()
src = self.database.get_source_from_handle(src_handle)
text = "%s [%s]" % (text,src.get_gramps_id())
self.normal_cell(text) self.normal_cell(text)
self.d.end_row() self.d.end_row()