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

Use date-specific place in report substitution variables

Browse Source 
Fix place title in graphical reports which have user-defined display formats
to use date-specific alternate name.

This impacts Ancestor Tree, Descendant Tree, and Family Descendant Tree.

Fixes #12763.
This commit is contained in:
GaryGriffin 2022-12-08 15:11:35 -08:00 committed by Nick Hall
parent 36d03137dd
commit 181e2d8540
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/plugins/lib/libsubstkeyword.py
View File

@ -346,7 +346,7 @@ class PlaceFormat(GenericFormat):
return None return None
def _default_format(self, place): def _default_format(self, place):
return _pd.display(self.database, place) return _pd.display(self.database, place, place.event_date)
def parse_format(self, database, place): def parse_format(self, database, place):
""" Parse the place """ """ Parse the place """
@ -432,6 +432,8 @@ class EventFormat(GenericFormat):
""" start formatting a place in this event """ """ start formatting a place in this event """
place_format = PlaceFormat(self.database, self.string_in) place_format = PlaceFormat(self.database, self.string_in)
place = place_format.get_place(self.database, event) place = place_format.get_place(self.database, event)
if event and place:
place.event_date = event.get_date_object()
return place_format.parse_format(self.database, place) return place_format.parse_format(self.database, place)
def format_attrib(): def format_attrib():
@ -889,6 +891,8 @@ class VariableParse:
return the result """ return the result """
place_f = PlaceFormat(self.database, self._in) place_f = PlaceFormat(self.database, self._in)
place = place_f.get_place(self.database, event) place = place_f.get_place(self.database, event)
if event and place:
place.event_date = event.get_date_object()
if self.empty_item(place): if self.empty_item(place):
return return
return place_f.parse_format(self.database, place) return place_f.parse_format(self.database, place)