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:23:23 +02:00
parent 6ade6ba419
commit 93422189fe
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

@ -3450,8 +3450,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.dbase_.get_place_from_handle(obj) name = self.report.obj_dict[Place][obj][1]
name = _pd.display(self.dbase_, place)
return (name.lower()) return (name.lower())
handle_list = sorted(place_handles, handle_list = sorted(place_handles,
@ -3467,7 +3466,7 @@ class PlacePages(BasePage):
place = self.dbase_.get_place_from_handle(place_handle_key) place = self.dbase_.get_place_from_handle(place_handle_key)
if place: if place:
if place.get_change_time() > ldatec: ldatec = place.get_change_time() if place.get_change_time() > ldatec: ldatec = place.get_change_time()
place_title = _pd.display(self.dbase_, place) place_title = self.report.obj_dict[Place][place_handle_key][1]
ml = get_main_location(self.dbase_, place) ml = get_main_location(self.dbase_, place)
if place_title and place_title != " ": if place_title and place_title != " ":
@ -3540,7 +3539,7 @@ class PlacePages(BasePage):
of, sio = self.report.create_file(place_handle, "plc") of, sio = self.report.create_file(place_handle, "plc")
self.up = True self.up = True
self.page_title = _pd.display(self.dbase_, 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']
@ -3557,7 +3556,7 @@ class PlacePages(BasePage):
placedetail += thumbnail placedetail += thumbnail
# add section title # add section title
placedetail += Html("h3", html_escape(place.get_name().get_value()), inline =True) placedetail += Html("h3", html_escape(place_name), inline =True)
# begin summaryarea division and places table # begin summaryarea division and places table
with Html("div", id ='summaryarea') as summaryarea: with Html("div", id ='summaryarea') as summaryarea:
@ -7554,7 +7553,10 @@ class NavWebReport(Report):
place = self.database.get_place_from_handle(place_handle) place = self.database.get_place_from_handle(place_handle)
if place is None: if place is None:
return return
place_name = _pd.display_event(self.database, event) if config.get('preferences.place-auto'):
place_name = _pd.display_event(self.database, 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, place.gramps_id, event) self.obj_dict[Place][place_handle] = (place_fname, place_name, place.gramps_id, event)