From 3121b0d1ed0124fc4e59fcda28fa226d18f6457c Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 20 Jun 2006 21:34:53 +0000 Subject: [PATCH] * src/DataViews/_PersonView.py (PersonView.person_updated): if surname fails, recalculate data svn: r6928 --- gramps2/ChangeLog | 2 ++ gramps2/src/DataViews/_PersonView.py | 35 +++++++++++++++------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index a258ccf90..70ef8044c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-06-20 Don Allingham + * src/DataViews/_PersonView.py (PersonView.person_updated): if surname + fails, recalculate data * src/Editors/_EditFamily.py: handle drag-n-drop for childrefs separately * src/Editors/_EditEvent.py: focus on date on open diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index ebe8c39e3..fab972954 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -151,11 +151,11 @@ class PersonView(PageView.PersonNavView): if len(mlist) != 2: from QuestionDialog import ErrorDialog - msg = _("Cannot merge people") - msg2 = _("Exactly two people must be selected to perform a merge. " - "A second person can be selected by holding down the " - "control key while clicking on the desired person.") - ErrorDialog(msg,msg2) + ErrorDialog( + _("Cannot merge people"), + _("Exactly two people must be selected to perform a merge. " + "A second person can be selected by holding down the " + "control key while clicking on the desired person.")) else: from QuestionDialog import ErrorDialog import Merge @@ -175,11 +175,11 @@ class PersonView(PageView.PersonNavView): mlist = self.get_selected_objects() if len(mlist) != 2: - msg = _("Cannot merge people") - msg2 = _("Exactly two people must be selected to perform a merge. " - "A second person can be selected by holding down the " - "control key while clicking on the desired person.") - ErrorDialog(msg,msg2) + ErrorDialog( + _("Cannot merge people"), + _("Exactly two people must be selected to perform a merge. " + "A second person can be selected by holding down the " + "control key while clicking on the desired person.")) else: import Merge @@ -188,11 +188,11 @@ class PersonView(PageView.PersonNavView): if p1 and p2: Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2) else: - msg = _("Cannot merge people") - msg2 = _("Exactly two people must be selected to perform a merge. " - "A second person can be selected by holding down the " - "control key while clicking on the desired person.") - ErrorDialog(msg,msg2) + ErrorDialog( + _("Cannot merge people"), + _("Exactly two people must be selected to perform a merge. " + "A second person can be selected by holding down the " + "control key while clicking on the desired person.")) def column_editor(self,obj): import ColumnOrder @@ -720,7 +720,10 @@ class PersonView(PageView.PersonNavView): surname = self.dbstate.db.get_name_group_mapping(base) if oldpath[0] == surname: - self.model.build_sub_entry(surname) + try: + self.model.build_sub_entry(surname) + except: + self.model.calculate_data() else: self.model.calculate_data()