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

* src/gramps_main.py (delete_person_response): Object/handle mixups,

Browse Source 
remove unneeded commits.


svn: r4252
This commit is contained in:
Alex Roitman 2005-03-29 16:41:40 +00:00
parent d05a9a483a
commit 753b5c28ec
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/ChangeLog
View File

@ -1,6 +1,8 @@
2005-03-29 Alex Roitman <shura@gramps-project.org> 2005-03-29 Alex Roitman <shura@gramps-project.org>
* src/Witness.py (WitnessEditor.__init__): Work around missing * src/Witness.py (WitnessEditor.__init__): Work around missing
reference. reference.
* src/gramps_main.py (delete_person_response): Object/handle mixups,
remove unneeded commits.
2005-03-29 Richard Taylor <rjt-gramps@thegrindstone.me.uk> 2005-03-29 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
* src/plugins/ScratchPad.py (on_object_select_row): fixed the drop of * src/plugins/ScratchPad.py (on_object_select_row): fixed the drop of

32
gramps2/src/gramps_main.py
View File

@ -1388,26 +1388,26 @@ class Gramps:
if not family_handle: if not family_handle:
continue continue
family = self.db.get_family_from_handle(family_handle) family = self.db.get_family_from_handle(family_handle)
family_to_remove = False
if self.active_person.get_handle() == family.get_father_handle(): if self.active_person.get_handle() == family.get_father_handle():
if family.get_mother_handle() == None: if family.get_mother_handle():
for child_handle in family.get_child_handle_list():
child = self.db.get_person_from_handle(child_handle)
child.remove_parent_family_handle(family.get_handle())
self.db.commit_person(child,trans)
self.db.remove_family(family.get_handle(),trans)
else:
family.set_father_handle(None) family.set_father_handle(None)
else:
if family.get_father_handle() == None:
for child_handle in family.get_child_handle_list():
child = self.db.get_person_from_handle(child_handle)
child.remove_parent_family_handle(family)
self.db.commit_person(child,trans)
self.db.remove_family(family,trans)
else: else:
family_to_remove = True
else:
if family.get_father_handle():
family.set_mother_handle(None) family.set_mother_handle(None)
self.db.commit_family(family,trans) else:
family_to_remove = True
if family_to_remove:
for child_handle in family.get_child_handle_list():
child = self.db.get_person_from_handle(child_handle)
child.remove_parent_family_handle(family_handle)
self.db.commit_person(child,trans)
self.db.remove_family(family_handle,trans)
else:
self.db.commit_family(family,trans)
for (family_handle,mrel,frel) in self.active_person.get_parent_family_handle_list(): for (family_handle,mrel,frel) in self.active_person.get_parent_family_handle_list():
if family_handle: if family_handle:
family = self.db.get_family_from_handle(family_handle) family = self.db.get_family_from_handle(family_handle)