Bug#4006: Fixed WebCal text being doubled up. Thank you Doug S. Blank for the patch.
svn: r15452
This commit is contained in:
parent
1e3b765bd4
commit
657e4dc784
@ -1147,9 +1147,9 @@ class WebCalReport(Report):
|
|||||||
|
|
||||||
# add link to NarrativeWeb
|
# add link to NarrativeWeb
|
||||||
if self.link_to_narweb:
|
if self.link_to_narweb:
|
||||||
text = Html("a", short_name,
|
text = str(Html("a", short_name,
|
||||||
href = self.build_url_fname_html(person.handle, "ppl",
|
href = self.build_url_fname_html(person.handle, "ppl",
|
||||||
prefix = self.narweb_prefix))
|
prefix = self.narweb_prefix)))
|
||||||
else:
|
else:
|
||||||
text = short_name
|
text = short_name
|
||||||
self.add_day_item(text, year, month, day, 'Birthday')
|
self.add_day_item(text, year, month, day, 'Birthday')
|
||||||
@ -1183,12 +1183,12 @@ class WebCalReport(Report):
|
|||||||
prob_alive_date = gen.lib.Date(this_year, month, day)
|
prob_alive_date = gen.lib.Date(this_year, month, day)
|
||||||
|
|
||||||
if self.link_to_narweb:
|
if self.link_to_narweb:
|
||||||
spouse_name = Html("a", spouse_name,
|
spouse_name = str(Html("a", spouse_name,
|
||||||
href = self.build_url_fname_html(spouse_handle, 'ppl',
|
href = self.build_url_fname_html(spouse_handle, 'ppl',
|
||||||
prefix = self.narweb_prefix))
|
prefix = self.narweb_prefix)))
|
||||||
short_name = Html("a", short_name,
|
short_name = str(Html("a", short_name,
|
||||||
href = self.build_url_fname_html(person.handle, 'ppl',
|
href = self.build_url_fname_html(person.handle, 'ppl',
|
||||||
prefix = self.narweb_prefix))
|
prefix = self.narweb_prefix)))
|
||||||
|
|
||||||
alive1 = probably_alive(person, db, prob_alive_date)
|
alive1 = probably_alive(person, db, prob_alive_date)
|
||||||
alive2 = probably_alive(spouse, db, prob_alive_date)
|
alive2 = probably_alive(spouse, db, prob_alive_date)
|
||||||
|
Loading…
Reference in New Issue
Block a user