From 33de80e6fd985ef022c78df966a26d9ea341a3d0 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Mon, 13 Sep 2010 19:55:13 +0000 Subject: [PATCH] 3519: Wrong 'Group as' value (Given instead of Surname) is used for custom display name svn: r15895 --- src/gen/display/name.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gen/display/name.py b/src/gen/display/name.py index 1b975bcef..0e5d2f072 100644 --- a/src/gen/display/name.py +++ b/src/gen/display/name.py @@ -602,8 +602,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]: @@ -613,7 +615,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()