From 426f451a0c899f2e41d94fca21bc2b3fdc371ce7 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 7 May 2006 21:54:56 +0000 Subject: [PATCH] 2006-05-07 Don Allingham * src/DataViews/_PersonView.py: rebuild tree on surname change, don't attempt to delete/insert, since this can cause things to hang. svn: r6573 --- gramps2/ChangeLog | 5 +++++ gramps2/src/DataViews/_PersonView.py | 29 +--------------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index aa2e0f1ef..ec81587df 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-05-07 Don Allingham + * src/DataViews/_PersonView.py: rebuild tree on surname change, + don't attempt to delete/insert, since this can cause things to + hang. + 2006-05-06 Alex Roitman * src/GrampsDb/_GrampsBSDDB.py (load): Use common undodb methods; reset undo history. diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index c4a3876f9..f148c15cc 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -660,34 +660,7 @@ class PersonView(PageView.PersonNavView): if oldpath == newpath: self.model.row_changed(pathval,pnode) else: - # paths different, get the new surname list - - mylist = self.model.temp_sname_sub.get(oldpath[0],[]) - path = self.model.on_get_path(node) - - # delete original - self.model.row_deleted(pathval) - - # delete top node of original if necessar - if len(mylist)==0: - self.model.row_deleted(pathval[0]) - - # determine if we need to insert a new top node', - insert = not self.model.sname_sub.has_key(newpath[0]) - - # assign new data - self.model.assign_data() - - # insert new row if needed - if insert: - path = self.model.on_get_path(newpath[0]) - pnode = self.model.get_iter(path) - self.model.row_inserted(path,pnode) - - # insert new person - path = self.model.on_get_path(node) - pnode = self.model.get_iter(path) - self.model.row_inserted(path,pnode) + self.rebuild_tree() self.goto_active_person() def get_selected_objects(self):