From 20225766489e45d910f9bf7924e3a577f6cb2727 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 13 Apr 2005 02:46:19 +0000 Subject: [PATCH] * src/FamilyView.py: commit family before people when committing new spouse. svn: r4355 --- ChangeLog | 2 ++ configure.in | 4 ++-- src/FamilyView.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ce25d5db..b159f99a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 2005-04-12 Don Allingham + * src/FamilyView.py: commit family before people when committing + new spouse. * src/EventEdit.py: more robust handler for new place after an edit 2005-04-12 Martin Hawlisch diff --git a/configure.in b/configure.in index 23390258d..ceb14a4c6 100644 --- a/configure.in +++ b/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.57) AC_INIT(gramps, 1.1.99, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) -RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') -dnl RELEASE=1 +dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/src/FamilyView.py b/src/FamilyView.py index 99baa5f8b..73aafc389 100644 --- a/src/FamilyView.py +++ b/src/FamilyView.py @@ -716,10 +716,11 @@ class FamilyView: family.set_father_handle(epo.person.get_handle()) family.set_mother_handle(self.person.get_handle()) + self.parent.db.commit_family(family,trans) self.parent.db.commit_person(new_person,trans) self.parent.db.commit_person(old_person,trans) - self.parent.db.commit_family(family,trans) self.parent.db.transaction_commit(trans,_("Add Spouse")) + self.family = family self.person = old_person m = Marriage.Marriage(self.parent,self.family,self.parent.db)