From f322ab43a63590d81f016a88b1892624e4369d83 Mon Sep 17 00:00:00 2001 From: SNoiraud Date: Wed, 20 Apr 2016 08:33:25 +0200 Subject: [PATCH] 9389: Narrated Web report - Individual page sort order has changed --- gramps/plugins/webreport/narrativeweb.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index 5fb4e94d7..ab668299d 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -532,6 +532,11 @@ def format_date(date): return val return "" +def sort_on_name_and_grampsid(obj, dbase): + person = dbase.get_person_from_handle(obj) + name = _nd.display(person) + return (name, person.get_gramps_id()) + def copy_thumbnail(report, handle, photo, region=None): """ Given a handle (and optional region) make (if needed) an @@ -3175,7 +3180,7 @@ class FamilyPages(BasePage): letter =' ' # get person from sorted database list - for person_handle in sorted(handle_list): + for person_handle in sorted(handle_list, key=lambda x: sort_on_name_and_grampsid(x, self.dbase_)): person = self.dbase_.get_person_from_handle(person_handle) if person: family_list = sorted(pers_fam_dict[person_handle], key=lambda x:x.get_gramps_id()) @@ -5333,7 +5338,7 @@ class PersonPages(BasePage): surname = _ABSENT first_surname = True - for person_handle in sorted(handle_list): + for person_handle in sorted(handle_list, key=lambda x: sort_on_name_and_grampsid(x, self.dbase_)): person = self.dbase_.get_person_from_handle(person_handle) if person.get_change_time() > date: date = person.get_change_time()