From 1736120c61b3d5e72c4dc9a46d940a699ad3db58 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 6 Mar 2007 21:18:40 +0000 Subject: [PATCH] 2007-03-06 Don Allingham * src/Editors/_EditFamily.py (EditFamily.save): disable data changed warning when saving the data - we know that it changed. svn: r8276 --- ChangeLog | 4 ++++ src/Editors/_EditFamily.py | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b846f4782..cceffca18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-03-06 Don Allingham + * src/Editors/_EditFamily.py (EditFamily.save): disable data changed warning + when saving the data - we know that it changed. + 2007-03-05 Brian Matherly * src/plugins/NarrativeWeb.py: Fix 0000954: e-mail address causes Narrative Web plugin to generate bad links diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index a302b86e8..238f7094d 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -361,6 +361,8 @@ class EditFamily(EditPrimary): EditPrimary.__init__(self, dbstate, uistate, track, family, dbstate.db.get_family_from_handle) + self.in_save = False + # look for the scenerio of a child and no parents on a new # family @@ -409,7 +411,7 @@ class EditFamily(EditPrimary): def check_for_family_change(self, handles): # check to see if the handle matches the current object - if self.obj.get_handle() in handles: + if not self.in_save and self.obj.get_handle() in handles: self.obj = self.dbstate.db.get_family_from_handle(self.obj.get_handle()) self.reload_people() @@ -771,6 +773,8 @@ class EditFamily(EditPrimary): def save(self,*obj): + self.in_save = True + if not self.added: original = self.db.get_family_from_handle(self.obj.handle) else: @@ -865,6 +869,7 @@ class EditFamily(EditPrimary): self.db.commit_family(self.obj,trans) self.db.transaction_commit(trans,_("Edit Family")) + self.in_save = False self.close() def _cleanup_on_exit(self):