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

Merge from 2.0.1

Browse Source 
svn: r4666
This commit is contained in:
Alex Roitman
2005-05-24 13:08:06 +00:00
parent 16b52bcb0f
commit ce05310959
73 changed files with 21569 additions and 14199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/src/MergeData.py
View File

@@ -168,8 +168,8 @@ class MergePlaces:
#-------------------------------------------------------------------------
class MergeSources:
"""
Merges to places into a single place. Displays a dialog box that
allows the places to be combined into one.
Merges to sources into a single source. Displays a dialog box that
allows the sources to be combined into one.
"""
def __init__(self,database,new_handle,old_handle,update):
self.db = database
@@ -291,7 +291,7 @@ class MergeSources:
event = self.db.get_event_from_handle(handle)
if event.has_source_reference(self.old_handle):
event.replace_source_references(self.old_handle,self.new_handle)
self.db.commit_event(event,self.trans)
self.db.commit_event(event,self.trans)
# sources
for handle in self.db.get_source_handles():