* src/AddSpouse.py (select_spouse_clicked): Prevent adding child
of the family as a spouse in that family. svn: r4154
This commit is contained in:
parent
697eb9a721
commit
3c0dda05f7
@ -29,6 +29,8 @@
|
||||
* src/EditPlace.py: Typo.
|
||||
|
||||
* 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>
|
||||
* src/NameEdit.py: assign date on close
|
||||
|
@ -55,6 +55,7 @@ import PeopleModel
|
||||
import Date
|
||||
import Marriage
|
||||
import NameDisplay
|
||||
from QuestionDialog import ErrorDialog
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -245,8 +246,16 @@ class AddSpouse:
|
||||
# don't do anything if the marriage already exists
|
||||
for f in self.person.get_family_handle_list():
|
||||
fam = self.db.get_family_from_handle(f)
|
||||
if spouse_id == fam.get_mother_handle() or \
|
||||
spouse_id == fam.get_father_handle():
|
||||
if fam:
|
||||
if spouse_id in \
|
||||
(fam.get_mother_handle(),fam.get_father_handle()):
|
||||
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user