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

* src/DataViews/_PersonView.py (PersonView.person_updated): if surname

Browse Source 
fails, recalculate data


svn: r6928
This commit is contained in:
Don Allingham 2006-06-20 21:34:53 +00:00
parent f9dc4c6d9a
commit ead9d7c761
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,4 +1,6 @@
2006-06-20 Don Allingham <don@gramps-project.org> 2006-06-20 Don Allingham <don@gramps-project.org>
* src/DataViews/_PersonView.py (PersonView.person_updated): if surname
fails, recalculate data
* src/Editors/_EditFamily.py: handle drag-n-drop for childrefs * src/Editors/_EditFamily.py: handle drag-n-drop for childrefs
separately separately
* src/Editors/_EditEvent.py: focus on date on open * src/Editors/_EditEvent.py: focus on date on open

27
src/DataViews/_PersonView.py
View File

@ -151,11 +151,11 @@ class PersonView(PageView.PersonNavView):
if len(mlist) != 2: if len(mlist) != 2:
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
msg = _("Cannot merge people") ErrorDialog(
msg2 = _("Exactly two people must be selected to perform a merge. " _("Cannot merge people"),
_("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the " "A second person can be selected by holding down the "
"control key while clicking on the desired person.") "control key while clicking on the desired person."))
ErrorDialog(msg,msg2)
else: else:
from QuestionDialog import ErrorDialog from QuestionDialog import ErrorDialog
import Merge import Merge
@ -175,11 +175,11 @@ class PersonView(PageView.PersonNavView):
mlist = self.get_selected_objects() mlist = self.get_selected_objects()
if len(mlist) != 2: if len(mlist) != 2:
msg = _("Cannot merge people") ErrorDialog(
msg2 = _("Exactly two people must be selected to perform a merge. " _("Cannot merge people"),
_("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the " "A second person can be selected by holding down the "
"control key while clicking on the desired person.") "control key while clicking on the desired person."))
ErrorDialog(msg,msg2)
else: else:
import Merge import Merge
@ -188,11 +188,11 @@ class PersonView(PageView.PersonNavView):
if p1 and p2: if p1 and p2:
Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2) Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
else: else:
msg = _("Cannot merge people") ErrorDialog(
msg2 = _("Exactly two people must be selected to perform a merge. " _("Cannot merge people"),
_("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the " "A second person can be selected by holding down the "
"control key while clicking on the desired person.") "control key while clicking on the desired person."))
ErrorDialog(msg,msg2)
def column_editor(self,obj): def column_editor(self,obj):
import ColumnOrder import ColumnOrder
@ -720,7 +720,10 @@ class PersonView(PageView.PersonNavView):
surname = self.dbstate.db.get_name_group_mapping(base) surname = self.dbstate.db.get_name_group_mapping(base)
if oldpath[0] == surname: if oldpath[0] == surname:
try:
self.model.build_sub_entry(surname) self.model.build_sub_entry(surname)
except:
self.model.calculate_data()
else: else:
self.model.calculate_data() self.model.calculate_data()