From bc0a3b5b04059d885bd9e46007d40ad312f458e7 Mon Sep 17 00:00:00 2001 From: SNoiraud Date: Sat, 18 Jun 2016 19:42:34 +0200 Subject: [PATCH] 9494: Narratedweb : surname listing errors for people with multiple partners --- gramps/plugins/webreport/narrativeweb.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index c0594909b..497ec0662 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -3326,16 +3326,22 @@ class SurnamePage(BasePage): family_list = person.get_family_handle_list() first_family = True if family_list: + fam_count = 0 for family_handle in family_list: + fam_count += 1 family = self.r_db.get_family_from_handle( family_handle) partner_handle = ReportUtils.find_spouse( person, family) if partner_handle: - if not first_family: - tcell += ',' - tcell += self.new_person_link( - partner_handle, uplink=True) + link = self.new_person_link(partner_handle, + uplink=True) + if fam_count < len(family_list): + if isinstance(link, Html): + link.inside += "," + else: + link += ',' + tcell += link first_family = False else: tcell += " "