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

* src/AddSpouse.py (select_spouse_clicked): Prevent adding child

Browse Source 
of the family as a spouse in that family.


svn: r4154
This commit is contained in:
Alex Roitman 2005-03-10 04:57:22 +00:00
parent db8bc4a5a7
commit c0bc367b86
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -29,6 +29,8 @@
* src/EditPlace.py: Typo. * src/EditPlace.py: Typo.
* src/FamilyView.py: Correct constants for birth relationship. * src/FamilyView.py: Correct constants for birth relationship.
* src/AddSpouse.py (select_spouse_clicked): Prevent adding child
of the family as a spouse in that family.
2005-03-09 Don Allingham <don@gramps-project.org> 2005-03-09 Don Allingham <don@gramps-project.org>
* src/NameEdit.py: assign date on close * src/NameEdit.py: assign date on close

17
src/AddSpouse.py
View File

@ -55,6 +55,7 @@ import PeopleModel
import Date import Date
import Marriage import Marriage
import NameDisplay import NameDisplay
from QuestionDialog import ErrorDialog
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -245,10 +246,18 @@ class AddSpouse:
# don't do anything if the marriage already exists # don't do anything if the marriage already exists
for f in self.person.get_family_handle_list(): for f in self.person.get_family_handle_list():
fam = self.db.get_family_from_handle(f) fam = self.db.get_family_from_handle(f)
if spouse_id == fam.get_mother_handle() or \ if fam:
spouse_id == fam.get_father_handle(): if spouse_id in \
Utils.destroy_passed_object(obj) (fam.get_mother_handle(),fam.get_father_handle()):
return ErrorDialog(_("Error adding a spouse"),
_("The spouse is already present in this family"))
Utils.destroy_passed_object(obj)
return
if spouse_id in fam.get_child_handle_list():
ErrorDialog(_("Error adding a spouse"),
_("A person cannot be linked as his/her own parent"))
Utils.destroy_passed_object(obj)
return
trans = self.db.transaction_begin() trans = self.db.transaction_begin()