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

* src/FamilyView.py: handle deleting of parent properly

Browse Source 
* src/plugins/WriteGedcom.py: revert to using GRAMPS ID values
* src/plugins/WriteXML.py: use proper ID values

* src/FamilyView.py: fix removal of parents


svn: r3265
This commit is contained in:
Don Allingham
2004-07-11 23:53:02 +00:00
parent c340a04e68
commit a156ad5cbd
6 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/src/AddSpouse.py
View File

@ -249,11 +249,12 @@ class AddSpouse:
return
spouse = self.db.get_person(idlist[0])
spouse_id = spouse.get_id()
# don't do anything if the marriage already exists
for f in self.person.get_family_id_list():
fam = self.db.find_family_from_id(f)
if spouse.get_id() == fam.get_mother_id() or spouse.get_id() == fam.get_father_id():
if spouse_id == fam.get_mother_id() or spouse_id == fam.get_father_id():
Utils.destroy_passed_object(obj)
return
@ -263,6 +264,7 @@ class AddSpouse:
self.active_family = self.db.new_family(trans)
self.person.add_family_id(self.active_family.get_id())
self.db.commit_person(self.person,trans)
spouse.add_family_id(self.active_family.get_id())
self.db.commit_person(spouse,trans)
@ -277,6 +279,7 @@ class AddSpouse:
self.active_family.set_relationship(rtype)
self.db.commit_family(self.active_family,trans)
self.db.add_transaction(trans,_("Add Spouse"))
Utils.destroy_passed_object(obj)
self.update(self.active_family)
m = Marriage.Marriage(self.parent, self.active_family,