2007-03-06 Don Allingham <don@gramps-project.org>
* src/Editors/_EditFamily.py (EditFamily.save): disable data changed warning when saving the data - we know that it changed. svn: r8276
This commit is contained in:
@ -1,3 +1,7 @@
|
|||||||
|
2007-03-06 Don Allingham <don@gramps-project.org>
|
||||||
|
* src/Editors/_EditFamily.py (EditFamily.save): disable data changed warning
|
||||||
|
when saving the data - we know that it changed.
|
||||||
|
|
||||||
2007-03-05 Brian Matherly <brian@gramps-project.org>
|
2007-03-05 Brian Matherly <brian@gramps-project.org>
|
||||||
* src/plugins/NarrativeWeb.py: Fix 0000954: e-mail address causes Narrative
|
* src/plugins/NarrativeWeb.py: Fix 0000954: e-mail address causes Narrative
|
||||||
Web plugin to generate bad links
|
Web plugin to generate bad links
|
||||||
|
@ -361,6 +361,8 @@ class EditFamily(EditPrimary):
|
|||||||
EditPrimary.__init__(self, dbstate, uistate, track,
|
EditPrimary.__init__(self, dbstate, uistate, track,
|
||||||
family, dbstate.db.get_family_from_handle)
|
family, dbstate.db.get_family_from_handle)
|
||||||
|
|
||||||
|
self.in_save = False
|
||||||
|
|
||||||
# look for the scenerio of a child and no parents on a new
|
# look for the scenerio of a child and no parents on a new
|
||||||
# family
|
# family
|
||||||
|
|
||||||
@ -409,7 +411,7 @@ class EditFamily(EditPrimary):
|
|||||||
def check_for_family_change(self, handles):
|
def check_for_family_change(self, handles):
|
||||||
|
|
||||||
# check to see if the handle matches the current object
|
# 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.obj = self.dbstate.db.get_family_from_handle(self.obj.get_handle())
|
||||||
self.reload_people()
|
self.reload_people()
|
||||||
@ -771,6 +773,8 @@ class EditFamily(EditPrimary):
|
|||||||
|
|
||||||
def save(self,*obj):
|
def save(self,*obj):
|
||||||
|
|
||||||
|
self.in_save = True
|
||||||
|
|
||||||
if not self.added:
|
if not self.added:
|
||||||
original = self.db.get_family_from_handle(self.obj.handle)
|
original = self.db.get_family_from_handle(self.obj.handle)
|
||||||
else:
|
else:
|
||||||
@ -865,6 +869,7 @@ class EditFamily(EditPrimary):
|
|||||||
self.db.commit_family(self.obj,trans)
|
self.db.commit_family(self.obj,trans)
|
||||||
self.db.transaction_commit(trans,_("Edit Family"))
|
self.db.transaction_commit(trans,_("Edit Family"))
|
||||||
|
|
||||||
|
self.in_save = False
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
def _cleanup_on_exit(self):
|
def _cleanup_on_exit(self):
|
||||||
|
Reference in New Issue
Block a user