From f852be14de31b6cf855a077e6e7d9a64e88763ac Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Mon, 13 Sep 2010 19:56:31 +0000
Subject: [PATCH] 3519: Wrong 'Group as' value (Given instead of Surname) is
used for custom display name
svn: r15896
---
src/gen/display/name.py | 8 ++++++--
src/plugins/webreport/NarrativeWeb.py | 3 ---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/gen/display/name.py b/src/gen/display/name.py
index 5defc81e4..f5d5b40e7 100644
--- a/src/gen/display/name.py
+++ b/src/gen/display/name.py
@@ -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()
diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index d7f218d17..566304930 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -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