From 0bc7bc8b4082b0c0e0d2c549b966bf4044b84557 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 21 Jan 2015 18:44:42 +0000 Subject: [PATCH] 7770: Always display main participants --- gramps/gui/editors/displaytabs/eventrefmodel.py | 6 +----- gramps/plugins/gramplet/events.py | 11 ++--------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/gramps/gui/editors/displaytabs/eventrefmodel.py b/gramps/gui/editors/displaytabs/eventrefmodel.py index fb40fd3bb..c560a88aa 100644 --- a/gramps/gui/editors/displaytabs/eventrefmodel.py +++ b/gramps/gui/editors/displaytabs/eventrefmodel.py @@ -166,11 +166,7 @@ class EventRefModel(Gtk.TreeStore): return "" def column_participant(self, event_ref): - if int(event_ref.get_role()) not in (EventRoleType.PRIMARY, - EventRoleType.FAMILY): - return get_participant_from_event(self.db, event_ref.ref) - else: - return "" + return get_participant_from_event(self.db, event_ref.ref) def column_age(self, event): """ diff --git a/gramps/plugins/gramplet/events.py b/gramps/plugins/gramplet/events.py index 72df86aaf..ebe1d71df 100644 --- a/gramps/plugins/gramplet/events.py +++ b/gramps/plugins/gramplet/events.py @@ -98,15 +98,8 @@ class Events(Gramplet, DbGUIElement): if handle: place = self.dbstate.db.get_place_from_handle(handle).get_title() - participants = '' - if int(event_ref.get_role()) == EventRoleType.FAMILY: - if spouse: - participants = name_displayer.display(spouse) - - if int(event_ref.get_role()) not in (EventRoleType.PRIMARY, - EventRoleType.FAMILY): - participants = get_participant_from_event(self.dbstate.db, - event_ref.ref) + participants = get_participant_from_event(self.dbstate.db, + event_ref.ref) self.model.add((event.get_handle(), str(event.get_type()),