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

3519: Wrong 'Group as' value (Given instead of Surname) is used for custom display name

Browse Source 
svn: r15895
This commit is contained in:
Benny Malengier
2010-09-13 19:55:13 +00:00
parent 46c9eb079c
commit 33de80e6fd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gen/display/name.py
View File

@ -602,8 +602,10 @@ def fn(%s):
return db.get_name_group_mapping(pn.surname) return db.get_name_group_mapping(pn.surname)
elif sv == Name.PTFN: elif sv == Name.PTFN:
return db.get_name_group_mapping(pn.patronymic) return db.get_name_group_mapping(pn.patronymic)
else: elif sv == Name.FN:
return db.get_name_group_mapping(pn.first_name) 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): def name_grouping_data(self, db, pn):
if pn[_GROUP]: if pn[_GROUP]:
@ -613,7 +615,9 @@ def fn(%s):
return db.get_name_group_mapping(pn[_SURNAME]) return db.get_name_group_mapping(pn[_SURNAME])
elif sv == Name.PTFN: elif sv == Name.PTFN:
return db.get_name_group_mapping(pn[_PATRONYM]) return db.get_name_group_mapping(pn[_PATRONYM])
else: elif sv == Name.FN:
return db.get_name_group_mapping(pn[_FIRSTNAME]) return db.get_name_group_mapping(pn[_FIRSTNAME])
else:
return db.get_name_group_mapping(pn[_SURNAME])
displayer = NameDisplay() displayer = NameDisplay()