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

bug report #2229: parental relationship redundantly says 'Birth'; merged from gramps30

Browse Source 
svn: r10818
This commit is contained in:
Stéphane Charette 2008-06-18 05:06:25 +00:00
parent 4e73de8987
commit e45bec4eb7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/NarrativeWeb.py
View File

@ -4,6 +4,7 @@
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# Copyright (C) 2007 Johan Gonqvist <johan.gronqvist@gmail.com> # Copyright (C) 2007 Johan Gonqvist <johan.gronqvist@gmail.com>
# Copyright (C) 2007 Gary Burton <gary.burton@zen.co.uk> # Copyright (C) 2007 Gary Burton <gary.burton@zen.co.uk>
# Copyright (C) 2007-2008 Stephane Charette <stephanecharette@gmail.com>
# Copyright (C) 2008 Brian G. Matherly # Copyright (C) 2008 Brian G. Matherly
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -2123,7 +2124,7 @@ class IndividualPage(BasePage):
self.person_link(of, url, _nd.display(person), gid) self.person_link(of, url, _nd.display(person), gid)
else: else:
of.write(_nd.display(person)) of.write(_nd.display(person))
if rel and rel != gen.lib.ChildRefType.BIRTH: if rel and rel != gen.lib.ChildRefType(gen.lib.ChildRefType.BIRTH):
of.write('&nbsp;&nbsp;&nbsp;(%s)' % str(rel)) of.write('&nbsp;&nbsp;&nbsp;(%s)' % str(rel))
of.write('</td>\n') of.write('</td>\n')
@ -2153,6 +2154,7 @@ class IndividualPage(BasePage):
if child_ref.ref == child_handle: if child_ref.ref == child_handle:
frel = child_ref.get_father_relation() frel = child_ref.get_father_relation()
mrel = child_ref.get_mother_relation() mrel = child_ref.get_mother_relation()
break
if not first: if not first:
of.write('\t\t\t<tr>\n') of.write('\t\t\t<tr>\n')
@ -3150,10 +3152,10 @@ class NavWebOptions(MenuReportOptions):
showparents.set_help(_('Whether to include a parents column')) showparents.set_help(_('Whether to include a parents column'))
menu.add_option(category_name, 'showparents', showparents) menu.add_option(category_name, 'showparents', showparents)
showhalfsiblings = BooleanOption(_("Include a column for half-siblings" showhalfsiblings = BooleanOption(_("Include half-siblings on the "
" on the index pages"), False) "individual pages"), False)
showhalfsiblings.set_help(_("Whether to include a half-siblings " showhalfsiblings.set_help(_("Whether to include half-siblings "
"column")) "with the parents and siblings"))
menu.add_option(category_name, 'showhalfsiblings', showhalfsiblings) menu.add_option(category_name, 'showhalfsiblings', showhalfsiblings)
def __archive_changed(self): def __archive_changed(self):