3519: Wrong 'Group as' value (Given instead of Surname) is used for custom display name
svn: r15896
This commit is contained in:
parent
e03e4bbf5c
commit
f852be14de
@ -616,8 +616,10 @@ def fn(%s):
|
||||
return db.get_name_group_mapping(pn.surname)
|
||||
elif sv == Name.PTFN:
|
||||
return db.get_name_group_mapping(pn.patronymic)
|
||||
else:
|
||||
elif sv == Name.FN:
|
||||
return db.get_name_group_mapping(pn.first_name)
|
||||
else:
|
||||
return db.get_name_group_mapping(pn.surname)
|
||||
|
||||
def name_grouping_data(self, db, pn):
|
||||
if pn[_GROUP]:
|
||||
@ -627,7 +629,9 @@ def fn(%s):
|
||||
return db.get_name_group_mapping(pn[_SURNAME])
|
||||
elif sv == Name.PTFN:
|
||||
return db.get_name_group_mapping(pn[_PATRONYM])
|
||||
else:
|
||||
elif sv == Name.FN:
|
||||
return db.get_name_group_mapping(pn[_FIRSTNAME])
|
||||
else:
|
||||
return db.get_name_group_mapping(pn[_SURNAME])
|
||||
|
||||
displayer = NameDisplay()
|
||||
|
@ -7009,9 +7009,6 @@ def add_birthdate(db, childlist):
|
||||
# return the list of child handles and their birthdates
|
||||
return sorted_children
|
||||
|
||||
# TODO: See http://www.gramps-project.org/bugs/view.php?id=4200 for issues about
|
||||
# marking the fall-back date with itallics
|
||||
#
|
||||
def _find_birth_date(db, person):
|
||||
"""
|
||||
will look for a birth date within the person's events
|
||||
|
Loading…
Reference in New Issue
Block a user