3282: Gramps should only display marriage event with role = family (or primary)
svn: r13411
This commit is contained in:
@@ -934,7 +934,9 @@ class FamilyLinesReport(Report):
|
||||
if self._incdates or self._incplaces:
|
||||
for event_ref in family.get_event_ref_list():
|
||||
event = self._db.get_event_from_handle(event_ref.ref)
|
||||
if event.get_type() == gen.lib.EventType.MARRIAGE:
|
||||
if 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 ):
|
||||
# get the wedding date
|
||||
if (event.private and self._incprivate) or not event.private:
|
||||
if self._incdates:
|
||||
|
||||
@@ -264,7 +264,9 @@ class RelGraphReport(Report):
|
||||
label = ""
|
||||
for event_ref in fam.get_event_ref_list():
|
||||
event = self.database.get_event_from_handle(event_ref.ref)
|
||||
if event.type == gen.lib.EventType.MARRIAGE:
|
||||
if event.type == gen.lib.EventType.MARRIAGE and \
|
||||
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
|
||||
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
|
||||
label = self.get_event_string(event)
|
||||
break
|
||||
if self.includeid:
|
||||
|
||||
Reference in New Issue
Block a user