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

3282: Gramps should only display marriage event with role = family (or primary)

Browse Source 
svn: r13410
This commit is contained in:
Benny Malengier
2009-10-25 16:51:15 +00:00
parent c5951cab7c
commit 75991dd5cd
9 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DataViews/PedigreeView.py
View File

@@ -367,7 +367,9 @@ class FormattingHelper(object):
text = ""
for event_ref in family.get_event_ref_list():
event = self.dbstate.db.get_event_from_handle(event_ref.ref)
if event and event.get_type() == gen.lib.EventType.MARRIAGE:
if event and event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
if line_count < 3:
return DateHandler.get_date(event)
name = str(event.get_type())

4
src/DataViews/RelationView.py
View File

@@ -1207,7 +1207,9 @@ class RelationshipView(PageView.PersonNavView):
for event_ref in family.get_event_ref_list():
handle = event_ref.ref
event = self.dbstate.db.get_event_from_handle(handle)
if event.get_type() == gen.lib.EventType.MARRIAGE:
if event and event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
self.write_event_ref(vbox, _('Marriage'), event)
value = True
return value