3863: Narrative Web report : role not displayed when not primary; moved associations above sources to include assoc sources
svn: r15209
This commit is contained in:
parent
ef6040b61d
commit
385c4d0a6d
@ -488,6 +488,9 @@ class BasePage(object):
|
||||
|
||||
# get event type and hyperlink to it or not?
|
||||
etype = str(evt.type)
|
||||
if (not evt_ref.get_role().is_primary() and
|
||||
not evt_ref.get_role().is_family()):
|
||||
etype += " (%s)" % evt_ref.get_role()
|
||||
evt_hyper = self.event_link(etype, evt_ref.ref, evt.gramps_id, subdirs) if hyp else etype
|
||||
trow += Html("td", evt_hyper, class_ = "ColumnEvent")
|
||||
|
||||
@ -3659,16 +3662,16 @@ class IndividualPage(BasePage):
|
||||
if sect10 is not None:
|
||||
individualdetail += sect10
|
||||
|
||||
# display sources
|
||||
sect11 = self.display_ind_sources(self.person)
|
||||
if sect11 is not None:
|
||||
individualdetail += sect11
|
||||
|
||||
# display associations
|
||||
assocs = self.person.get_person_ref_list()
|
||||
if assocs:
|
||||
individualdetail += self.display_ind_associations(assocs)
|
||||
|
||||
# display sources
|
||||
sect11 = self.display_ind_sources(self.person)
|
||||
if sect11 is not None:
|
||||
individualdetail += sect11
|
||||
|
||||
# display pedigree
|
||||
sect13 = self.display_ind_pedigree()
|
||||
if sect13 is not None:
|
||||
|
Loading…
Reference in New Issue
Block a user