Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5226: NarWeb, family events don't list persons on event page and event list page

Browse Source 
svn: r18146
This commit is contained in:
Michiel Nauta 2011-09-11 10:32:37 +00:00
parent 716c959e23
commit dc00fa980d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/webreport/NarrativeWeb.py
View File

@ -3315,14 +3315,16 @@ class EventListPage(BasePage):
if gid not in _EVENT_DISPLAYED: if gid not in _EVENT_DISPLAYED:
# family event # family event
if _type in _EVENTMAP: if int(_type) in _EVENTMAP:
handle_list = db.find_backlink_handles(event_handle, handle_list = set(db.find_backlink_handles(
include_classes = ['Family']) event_handle,
include_classes=['Family', 'Person']))
# personal event # personal event
else: else:
handle_list = db.find_backlink_handles(event_handle, handle_list = set(db.find_backlink_handles(
include_classes = ['Person']) event_handle,
include_classes=['Person']))
if handle_list: if handle_list:
trow = Html("tr") trow = Html("tr")
@ -3346,7 +3348,8 @@ class EventListPage(BasePage):
tcell += " " tcell += " "
# display Event type if first in the list # display Event type if first in the list
tcell = Html("td", class_ = "ColumnType", inline = True) tcell = Html("td", class_="ColumnType",
title=evt_type, inline=True)
trow += tcell trow += tcell
if first_event: if first_event:
tcell += evt_type tcell += evt_type
@ -3495,8 +3498,8 @@ class EventPage(BasePage):
trow += tcell trow += tcell
# Person(s) field # Person(s) field
handle_list = db.find_backlink_handles(event_handle, handle_list = set(db.find_backlink_handles(event_handle,
include_classes = ['Family' if event.type in _EVENTMAP else 'Person']) include_classes = ['Family', 'Person'] if int(event.type) in _EVENTMAP else ['Person']))
first_person = True first_person = True
# get person(s) for ColumnPerson # get person(s) for ColumnPerson