svn: r7350

This commit is contained in:
Don Allingham 2006-10-04 05:01:14 +00:00
parent b178a57f86
commit b0c6a56416

View File

@ -683,29 +683,30 @@ class EditFamily(EditPrimary):
'a duplicate family. It is recommended that ' 'a duplicate family. It is recommended that '
'you cancel the editing of this window, and ' 'you cancel the editing of this window, and '
'select the existing family')) 'select the existing family'))
else: # else:
for fh in father.get_family_handle_list(): # for fh in father.get_family_handle_list():
fam = self.dbstate.db.get_family_from_handle(fh) # fam = self.dbstate.db.get_family_from_handle(fh)
if fam.get_mother_handle() == None: # if fam.get_mother_handle() == None:
self.close() # self.close()
try: # try:
clist = self.obj.get_child_ref_list() # clist = self.obj.get_child_ref_list()
fam.add_child_ref(clist[-1]) # fam.add_child_ref(clist[-1])
EditFamily(self.dbstate,self.uistate,[],fam) # EditFamily(self.dbstate,self.uistate,[],fam)
except Errors.WindowActiveError: # except Errors.WindowActiveError:
pass # pass
elif mother_handle: # elif mother_handle:
mother = self.dbstate.db.get_person_from_handle(mother_handle) # mother = self.dbstate.db.get_person_from_handle(mother_handle)
for fh in mother.get_family_handle_list(): # for fh in mother.get_family_handle_list():
fam = self.dbstate.db.get_family_from_handle(fh) # fam = self.dbstate.db.get_family_from_handle(fh)
if fam.get_father_handle() == None: # if fam.get_father_handle() == None:
self.close() # self.close()
try: # try:
clist = self.obj.get_child_ref_list() # clist = self.obj.get_child_ref_list()
fam.add_child_ref(clist[-1]) # print clist
EditFamily(self.dbstate,self.uistate,[],fam) # fam.add_child_ref(clist[-1])
except Errors.WindowActiveError: # EditFamily(self.dbstate,self.uistate,[],fam)
pass # except Errors.WindowActiveError:
# pass
def edit_person(self,obj,event,handle): def edit_person(self,obj,event,handle):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: