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

2007-07-29 Don Allingham <don@gramps-project.org>

Browse Source 
* src/Merge/_MergePerson.py (MergePeople.copy_note): convert to the
	new notelist format (#0001130)



svn: r8789
This commit is contained in:
Don Allingham 2007-07-30 01:57:02 +00:00
parent 9a71cbafd2
commit 85d33c2a85
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-07-29 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePerson.py (MergePeople.copy_note): convert to the
new notelist format (#0001130)
2007-07-29 Brian Matherly <brian@gramps-project.org> 2007-07-29 Brian Matherly <brian@gramps-project.org>
* src/plugins/MarkerReport.py: Typo. * src/plugins/MarkerReport.py: Typo.

4
src/Merge/_MergePerson.py
View File

@ -452,9 +452,7 @@ class MergePeople:
new.add_media_reference(photo) new.add_media_reference(photo)
# note # note
note1 = self.p1.get_note_object() new.set_note_list(self.p1.get_note_list() + self.p2.get_note_list())
note2 = self.p2.get_note_object()
new.set_note_object(self.merge_notes(note1,note2))
def merge_gramps_ids(self,new): def merge_gramps_ids(self,new):
""" """