From 20abe966d36120a282b035fb5ae3161693719166 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 17 Aug 2006 21:48:12 +0000 Subject: [PATCH] 2006-08-17 Don Allingham * src/DataViews/_PersonView.py: rebuild after compare and merge (bug #350) svn: r7193 --- ChangeLog | 4 ++++ src/DataViews/_PersonView.py | 3 ++- src/Merge/_MergePerson.py | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e886cdb4c..3c1cff91f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-08-17 Don Allingham + * src/DataViews/_PersonView.py: rebuild after compare and + merge (bug #350) + 2006-08-17 Alex Roitman * src/StartupDialog.py (__init__): Pass its class to Assistant. * src/Exporter.py (__init__): Pass its class to Assistant. diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index 89f93563d..055296eb5 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -165,7 +165,8 @@ class PersonView(PageView.PersonNavView): p1 = self.db.get_person_from_handle(mlist[0]) p2 = self.db.get_person_from_handle(mlist[1]) if p1 and p2: - Merge.PersonCompare(self.dbstate, self.uistate, p1, p2) + Merge.PersonCompare(self.dbstate, self.uistate, p1, p2, + self.build_tree) else: QuestionDialog.ErrorDialog( _("Cannot merge people"), diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py index 36a2aa073..99941fb34 100644 --- a/src/Merge/_MergePerson.py +++ b/src/Merge/_MergePerson.py @@ -102,6 +102,7 @@ class PersonCompare(ManagedWindow.ManagedWindow): merge = MergePeople(self.db,self.p2,self.p1) self.close() merge.merge() + print self.update if self.update: self.update()