Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Narrativeweb : place title must agree the references.place-auto configuration

Browse Source
This commit is contained in:
SNoiraud 2016-07-26 09:37:41 +02:00
parent a512c9d5eb
commit 92f7631fe3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gramps/plugins/webreport/narrativeweb.py
View File

@ -3790,8 +3790,7 @@ class PlacePages(BasePage):
# bug 9495 : incomplete display of place hierarchy labels # bug 9495 : incomplete display of place hierarchy labels
def sort_by_place_name(obj): def sort_by_place_name(obj):
place = self.r_db.get_place_from_handle(obj) name = self.report.obj_dict[Place][obj][1]
name = _pd.display(self.r_db, place)
return (name.lower()) return (name.lower())
handle_list = sorted(place_handles, handle_list = sorted(place_handles,
@ -3807,7 +3806,7 @@ class PlacePages(BasePage):
if place: if place:
if place.get_change_time() > ldatec: if place.get_change_time() > ldatec:
ldatec = place.get_change_time() 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) main_location = get_main_location(self.r_db, place)
if place_title and place_title != " ": if place_title and place_title != " ":
@ -3892,7 +3891,7 @@ class PlacePages(BasePage):
output_file, sio = self.report.create_file(place_handle, "plc") output_file, sio = self.report.create_file(place_handle, "plc")
self.uplink = True self.uplink = True
self.page_title = _pd.display(self.r_db, place) self.page_title = place_name
placepage, head, body = self.write_header(_("Places")) placepage, head, body = self.write_header(_("Places"))
self.placemappages = self.report.options['placemappages'] self.placemappages = self.report.options['placemappages']
@ -3911,7 +3910,7 @@ class PlacePages(BasePage):
# add section title # add section title
placedetail += Html("h3", placedetail += Html("h3",
html_escape(place.get_name().get_value()), html_escape(place_name),
inline=True) inline=True)
# begin summaryarea division and places table # begin summaryarea division and places table
@ -8620,7 +8619,10 @@ class NavWebReport(Report):
place = self._db.get_place_from_handle(place_handle) place = self._db.get_place_from_handle(place_handle)
if place is None: if place is None:
return 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", place_fname = self.build_url_fname(place_handle, "plc",
False) + self.ext False) + self.ext
self.obj_dict[Place][place_handle] = (place_fname, place_name, self.obj_dict[Place][place_handle] = (place_fname, place_name,