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

2006-06-21 Don Allingham <don@gramps-project.org>

Browse Source 
* src/Editors/_EditFamily.py: Don't attempt to be too clever and
	swap families if a duplicate is found. Just warn, and continue.



svn: r6943
This commit is contained in:
Don Allingham 2006-06-21 20:13:40 +00:00
parent 015e1829b0
commit f15764b240
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-06-21 Don Allingham <don@gramps-project.org>
* src/Editors/_EditFamily.py: Don't attempt to be too clever and
swap families if a duplicate is found. Just warn, and continue.
2006-06-21 Zsolt Foldvari <zsolt.foldvari@nokia.com> 2006-06-21 Zsolt Foldvari <zsolt.foldvari@nokia.com>
* src/DisplayTabs/_GalleryTab.py (GalleryTab.build_interface): * src/DisplayTabs/_GalleryTab.py (GalleryTab.build_interface):
Properly add icon list. Properly add icon list.

11
gramps2/src/Editors/_EditFamily.py
View File

@ -652,16 +652,7 @@ class EditFamily(EditPrimary):
mfam = set(mother.get_family_handle_list()) mfam = set(mother.get_family_handle_list())
common = list(mfam.intersection(ffam)) common = list(mfam.intersection(ffam))
if len(common) > 0: if len(common) > 0:
if self.add_parent: if self.add_parent or self.obj.handle not in common:
clist = self.obj.get_child_ref_list()
self.obj = self.dbstate.db.get_family_from_handle(common[0])
self.obj.add_child_ref(clist[0])
self.close()
try:
EditFamily(self.dbstate,self.uistate,[],self.obj)
except Errors.WindowActiveError:
pass
elif self.obj.handle not in common:
import QuestionDialog import QuestionDialog
QuestionDialog.WarningDialog( QuestionDialog.WarningDialog(
_('Duplicate Family'), _('Duplicate Family'),