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

Fix reports for shared event attribute and note errors

Browse Source 
Fixes #10720
This commit is contained in:
prculley 2018-10-06 17:08:14 -05:00 committed by Nick Hall
parent b175b5cb60
commit e926934a49
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/plugins/textreport/detancestralreport.py
View File

@ -484,7 +484,7 @@ class DetAncestorReport(Report):
if self.inc_attrs: if self.inc_attrs:
text = "" text = ""
attr_list = event.get_attribute_list() attr_list = event.get_attribute_list()[:] # we don't want to modify cached original
attr_list.extend(event_ref.get_attribute_list()) attr_list.extend(event_ref.get_attribute_list())
for attr in attr_list: for attr in attr_list:
if text: if text:
@ -504,7 +504,7 @@ class DetAncestorReport(Report):
if self.includenotes: if self.includenotes:
# if the event or event reference has a note attached to it, # if the event or event reference has a note attached to it,
# get the text and format it correctly # get the text and format it correctly
notelist = event.get_note_list() notelist = event.get_note_list()[:] # we don't want to modify cached original
notelist.extend(event_ref.get_note_list()) notelist.extend(event_ref.get_note_list())
for notehandle in notelist: for notehandle in notelist:
note = self._db.get_note_from_handle(notehandle) note = self._db.get_note_from_handle(notehandle)

4
gramps/plugins/textreport/detdescendantreport.py
View File

@ -509,7 +509,7 @@ class DetDescendantReport(Report):
if self.inc_attrs: if self.inc_attrs:
text = "" text = ""
attr_list = event.get_attribute_list() attr_list = event.get_attribute_list()[:] # we don't want to modify cached original
attr_list.extend(event_ref.get_attribute_list()) attr_list.extend(event_ref.get_attribute_list())
for attr in attr_list: for attr in attr_list:
if text: if text:
@ -529,7 +529,7 @@ class DetDescendantReport(Report):
if self.inc_notes: if self.inc_notes:
# if the event or event reference has a note attached to it, # if the event or event reference has a note attached to it,
# get the text and format it correctly # get the text and format it correctly
notelist = event.get_note_list() notelist = event.get_note_list()[:] # we don't want to modify cached original
notelist.extend(event_ref.get_note_list()) notelist.extend(event_ref.get_note_list())
for notehandle in notelist: for notehandle in notelist:
note = self._db.get_note_from_handle(notehandle) note = self._db.get_note_from_handle(notehandle)

2
gramps/plugins/textreport/indivcomplete.py
View File

@ -256,7 +256,7 @@ class IndivCompleteReport(Report):
def write_note(self): def write_note(self):
""" write a note """ """ write a note """
notelist = self.person.get_note_list() notelist = self.person.get_note_list()[:] # we don't want to modify cached original
notelist += self.family_notes_list notelist += self.family_notes_list
if self.names_notes_list: if self.names_notes_list:
for note_handle in self.names_notes_list: for note_handle in self.names_notes_list:

4
gramps/plugins/webreport/basepage.py
View File

@ -679,13 +679,13 @@ class BasePage: # pylint: disable=C1001
trow += Html("td", srcrefs, class_="ColumnSources", rowspan=2) trow += Html("td", srcrefs, class_="ColumnSources", rowspan=2)
# get event notes # get event notes
notelist = event.get_note_list() notelist = event.get_note_list()[:] # we don't want to modify cached original
notelist.extend(event_ref.get_note_list()) notelist.extend(event_ref.get_note_list())
htmllist = self.dump_notes(notelist) htmllist = self.dump_notes(notelist)
# if the event or event reference has an attribute attached to it, # if the event or event reference has an attribute attached to it,
# get the text and format it correctly? # get the text and format it correctly?
attrlist = event.get_attribute_list() attrlist = event.get_attribute_list()[:] # we don't want to modify cached original
attrlist.extend(event_ref.get_attribute_list()) attrlist.extend(event_ref.get_attribute_list())
for attr in attrlist: for attr in attrlist:
htmllist.extend(Html("p", htmllist.extend(Html("p",