From e01e3ee51756d667ea5e129ae02524b8398bf643 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 13 Apr 2006 17:10:29 +0000 Subject: [PATCH] Updates svn: r6330 --- gramps2/ChangeLog | 5 +++++ gramps2/src/Editors/_EditPerson.py | 7 ++++--- gramps2/src/RelLib/_ChildRef.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index ed523b499..48dda9c51 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-04-13 Alex Roitman + * src/Editors/_EditPerson.py (reorder_child_ref_list): Use + child_ref_list. + * src/RelLib/_ChildRef.py (serialize): Typo. + 2006-04-13 Don Allingham * various: start childref conversion diff --git a/gramps2/src/Editors/_EditPerson.py b/gramps2/src/Editors/_EditPerson.py index 1f0173abf..067c0d5eb 100644 --- a/gramps2/src/Editors/_EditPerson.py +++ b/gramps2/src/Editors/_EditPerson.py @@ -450,12 +450,12 @@ class EditPerson(EditPrimary): f = self.db.find_family_from_handle(family, trans) new_order = self.reorder_child_ref_list(self.obj, f.get_child_ref_list()) - f.set_child_handle_list(new_order) - for (family, rel1, rel2) in self.obj.get_parent_family_handle_list(): + f.set_child_ref_list(new_order) + for family in self.obj.get_parent_family_handle_list(): f = self.db.find_family_from_handle(family, trans) new_order = self.reorder_child_ref_list(self.obj, f.get_child_ref_list()) - f.set_child_handle_list(new_order) + f.set_child_ref_list(new_order) error = False original = self.db.get_person_from_handle(self.obj.handle) @@ -586,6 +586,7 @@ class EditPerson(EditPrimary): inorder = True prev_date = 0 handle_list = [ref.ref for ref in child_ref_list] + print handle_list for i in range(len(handle_list)): child_handle = handle_list[i] child = self.db.get_person_from_handle(child_handle) diff --git a/gramps2/src/RelLib/_ChildRef.py b/gramps2/src/RelLib/_ChildRef.py index 8f7208ac3..35f934ab7 100644 --- a/gramps2/src/RelLib/_ChildRef.py +++ b/gramps2/src/RelLib/_ChildRef.py @@ -75,7 +75,7 @@ class ChildRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase): return (PrivacyBase.serialize(self), SourceBase.serialize(self), NoteBase.serialize(self), - RefBase.__init__(self), + RefBase.serialize(self), self.frel,self.mrel) def unserialize(self,data):