7770: Always display main participants

This commit is contained in:
Nick Hall 2015-01-21 18:44:42 +00:00
parent c8e60460c1
commit 0bc7bc8b40
2 changed files with 3 additions and 14 deletions

View File

@ -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):
"""

View File

@ -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()),