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

A proper fix for events to work in the display format

Browse Source 
svn: r19436
This commit is contained in:
Craig J. Anderson 2012-05-04 18:03:24 +00:00
parent bcae939e84
commit cc7d0ea906
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/lib/libsubstkeyword.py
View File

@ -921,13 +921,9 @@ class VariableParse(object):
else:
return ""
def __parse_event(self, person):
#TODO; this try to avoid a key issue
try:
event = self.get_event_by_name(person, attrib_parse.get_name())
event_f = EventFormat(self.database, self._in)
except:
return ""
def __parse_event(self, person, attrib_parse):
event = self.get_event_by_name(person, attrib_parse.get_name())
event_f = EventFormat(self.database, self._in)
if event:
return event_f.parse_format(event)
else:
@ -1047,11 +1043,11 @@ class VariableParse(object):
elif next_char == "e":
#person event
_out.add_variable(
self.__parse_event(self.friend.person))
self.__parse_event(self.friend.person, attrib_parse))
elif next_char == "t":
#person event
_out.add_variable(
self.__parse_event(self.friend.family))
self.__parse_event(self.friend.family, attrib_parse))
#------------------------------------------------------------------------