diff --git a/ChangeLog b/ChangeLog index 16ac0e8c0..815ed1a4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-10-16 Gary Burton + * src/plugins/NarrativeWeb.py: 0001267: Web report and shared event + 2007-10-16 Frederik De Richter * src/plugins/rel_nl.py: new version diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 9f643e8ae..03b0474b4 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -85,6 +85,7 @@ from DateHandler import displayer as _dd from DateHandler import parser as _dp from gen.proxy import PrivateProxyDb from gen.proxy import LivingProxyDb +from gen.lib.eventroletype import EventRoleType #------------------------------------------------------------------------ # @@ -1916,7 +1917,7 @@ class IndividualPage(BasePage): of.write('\n\n\n') def display_ind_events(self,of): - evt_ref_list = self.person.get_primary_event_ref_list() + evt_ref_list = self.person.get_event_ref_list() if not evt_ref_list: return @@ -1929,7 +1930,13 @@ class IndividualPage(BasePage): event = self.db.get_event_from_handle(event_ref.ref) if event: evt_name = str(event.get_type()) - of.write('%s\n' % evt_name) + + if event_ref.get_role() == EventRoleType.PRIMARY: + of.write('%s\n' % evt_name) + else: + of.write('%s (%s)\n' \ + % (evt_name, event_ref.get_role())) + of.write('\n') of.write(self.format_event(event)) of.write('\n')