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

Bug #3812: Fixed event notes being shown on individual pages.

Browse Source 
svn: r15058
This commit is contained in:
Rob G. Healey
2010-04-08 00:33:30 +00:00
parent 6846dc43dd
commit f52dc92ad0
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,7 +459,7 @@ class BasePage(object):
""" """
for more information: see get_event_data() for more information: see get_event_data()
""" """
event_data = self.get_event_data(evt, evt_ref, True, False, subdirs) event_data = self.get_event_data(evt, evt_ref, subdirs)
trow.extend( trow.extend(
Html("td", data or " ", class_ = "Column" + colclass, Html("td", data or " ", class_ = "Column" + colclass,
@@ -470,7 +470,9 @@ class BasePage(object):
notelist = evt.get_note_list() notelist = evt.get_note_list()
notelist.extend( evt_ref.get_note_list() ) notelist.extend( evt_ref.get_note_list() )
if notelist: if notelist:
notelist = self.dump_notes( notelist ) or " " notelist = self.dump_notes( notelist )
else:
notelist = " "
trow += Html("td", notelist, class_ = "ColumnNotes") trow += Html("td", notelist, class_ = "ColumnNotes")
# get event source references # get event source references
@@ -499,15 +501,14 @@ class BasePage(object):
else: else:
return eventtype return eventtype
def get_event_data(self, evt, evt_ref, showplc, showdescr, up, gid = None): def get_event_data(self, evt, evt_ref, up, gid = None):
""" """
retrieve event data from event and evt_ref retrieve event data from event and evt_ref
@param: evt = event from database @param: evt = event from database
@param: evt_ref = eent reference @param: evt_ref = eent reference
@param: showplc = show the event place or not?
@param: showdescr = to show the event description or not?
@param: up = either True or False; add subdirs or not? @param: up = either True or False; add subdirs or not?
@param: gid = gramps_id
""" """
db = self.report.database db = self.report.database
@@ -526,16 +527,10 @@ class BasePage(object):
# position 0 = translatable label, position 1 = column class # position 0 = translatable label, position 1 = column class
# position 2 = data # position 2 = data
info = [ info = [
[DHEAD, "Date", _dd.display(evt.get_date_object() )] [DHEAD, "Date", _dd.display(evt.get_date_object() )],
[PHEAD, "Place", place_hyper]
] ]
if showplc:
info.append([PHEAD, "Place", place_hyper])
if showdescr:
descr = evt.get_description()
info.append([DESCRHEAD, "Description", descr])
# return event data information to its callers # return event data information to its callers
return info return info
@@ -2497,7 +2492,7 @@ class EventPage(BasePage):
""" """
for more information: see get_event_data() for more information: see get_event_data()
""" """
event_data = self.get_event_data(event, event_handle, True, True, subdirs, evt_gid) event_data = self.get_event_data(event, event_handle, subdirs, evt_gid)
for (label, colclass, data) in event_data: for (label, colclass, data) in event_data:
if data: if data: