From 92f7631fe3f36e35372c0be88b1c19a64556728e Mon Sep 17 00:00:00 2001 From: SNoiraud Date: Tue, 26 Jul 2016 09:37:41 +0200 Subject: [PATCH] Narrativeweb : place title must agree the references.place-auto configuration --- gramps/plugins/webreport/narrativeweb.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index 5ded2f280..92594ef98 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -3790,8 +3790,7 @@ class PlacePages(BasePage): # bug 9495 : incomplete display of place hierarchy labels def sort_by_place_name(obj): - place = self.r_db.get_place_from_handle(obj) - name = _pd.display(self.r_db, place) + name = self.report.obj_dict[Place][obj][1] return (name.lower()) handle_list = sorted(place_handles, @@ -3807,7 +3806,7 @@ class PlacePages(BasePage): if place: if place.get_change_time() > ldatec: ldatec = place.get_change_time() - place_title = _pd.display(self.r_db, place) + place_title = self.report.obj_dict[Place][place_handle][1] main_location = get_main_location(self.r_db, place) if place_title and place_title != " ": @@ -3892,7 +3891,7 @@ class PlacePages(BasePage): output_file, sio = self.report.create_file(place_handle, "plc") self.uplink = True - self.page_title = _pd.display(self.r_db, place) + self.page_title = place_name placepage, head, body = self.write_header(_("Places")) self.placemappages = self.report.options['placemappages'] @@ -3911,7 +3910,7 @@ class PlacePages(BasePage): # add section title placedetail += Html("h3", - html_escape(place.get_name().get_value()), + html_escape(place_name), inline=True) # begin summaryarea division and places table @@ -8620,7 +8619,10 @@ class NavWebReport(Report): place = self._db.get_place_from_handle(place_handle) if place is None: return - place_name = _pd.display_event(self._db, event) + if config.get('preferences.place-auto'): + place_name = _pd.display_event(self._db, event) + else: + place_name = place.get_title() place_fname = self.build_url_fname(place_handle, "plc", False) + self.ext self.obj_dict[Place][place_handle] = (place_fname, place_name,