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

2006-08-17 Don Allingham <don@gramps-project.org>

Browse Source 
* src/DataViews/_PersonView.py: rebuild after compare and
	merge (bug #350)



svn: r7193
This commit is contained in:
Don Allingham 2006-08-17 21:48:12 +00:00
parent 3771ae49d5
commit 35d691568a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-08-17 Don Allingham <don@gramps-project.org>
* src/DataViews/_PersonView.py: rebuild after compare and
merge (bug #350)
2006-08-17 Alex Roitman <shura@gramps-project.org> 2006-08-17 Alex Roitman <shura@gramps-project.org>
* src/StartupDialog.py (__init__): Pass its class to Assistant. * src/StartupDialog.py (__init__): Pass its class to Assistant.
* src/Exporter.py (__init__): Pass its class to Assistant. * src/Exporter.py (__init__): Pass its class to Assistant.

3
gramps2/src/DataViews/_PersonView.py
View File

@ -165,7 +165,8 @@ class PersonView(PageView.PersonNavView):
p1 = self.db.get_person_from_handle(mlist[0]) p1 = self.db.get_person_from_handle(mlist[0])
p2 = self.db.get_person_from_handle(mlist[1]) p2 = self.db.get_person_from_handle(mlist[1])
if p1 and p2: if p1 and p2:
Merge.PersonCompare(self.dbstate, self.uistate, p1, p2) Merge.PersonCompare(self.dbstate, self.uistate, p1, p2,
self.build_tree)
else: else:
QuestionDialog.ErrorDialog( QuestionDialog.ErrorDialog(
_("Cannot merge people"), _("Cannot merge people"),

1
gramps2/src/Merge/_MergePerson.py
View File

@ -102,6 +102,7 @@ class PersonCompare(ManagedWindow.ManagedWindow):
merge = MergePeople(self.db,self.p2,self.p1) merge = MergePeople(self.db,self.p2,self.p1)
self.close() self.close()
merge.merge() merge.merge()
print self.update
if self.update: if self.update:
self.update() self.update()