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

4131: [NarWeb] No clickable link in referenced region in the photo, if person has no name

Browse Source 
svn: r15860
This commit is contained in:
Benny Malengier 2010-09-09 11:15:28 +00:00
parent 9f9af706a4
commit 01afd075a7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/webreport/NarrativeWeb.py
View File

@ -1325,6 +1325,8 @@ class BasePage(object):
_name = _obj.get_primary_name().get_call_name() _name = _obj.get_primary_name().get_call_name()
if not _name: if not _name:
_name = _obj.get_primary_name().get_first_name() _name = _obj.get_primary_name().get_first_name()
if not _name:
_name = _("Unknown")
_linkurl = self.report.build_url_fname_html(_obj.handle, "ppl", True) _linkurl = self.report.build_url_fname_html(_obj.handle, "ppl", True)
elif classname == "Family": elif classname == "Family":
_obj = db.get_family_from_handle( newhandle ) _obj = db.get_family_from_handle( newhandle )
@ -1344,14 +1346,20 @@ class BasePage(object):
_linkurl = self.report.build_url_fname_html(partner1_handle, "ppl", True) _linkurl = self.report.build_url_fname_html(partner1_handle, "ppl", True)
elif partner2: elif partner2:
_name = partner2.get_primary_name().get_first_name() _name = partner2.get_primary_name().get_first_name()
_linkurl = self.report.build_url_fname_html(partner2_handle, "ppl", True) _linkurl = self.report.build_url_fname_html(partner2_handle, "ppl", True)
if not _name:
_name = _("Unknown")
elif classname == "Event": elif classname == "Event":
_obj = db.get_event_from_handle( newhandle ) _obj = db.get_event_from_handle( newhandle )
_name = _obj.get_description() _name = _obj.get_description()
if not _name:
_name = _("Unknown")
_linkurl = self.report.build_url_fname_html(_obj.handle, "evt", True) _linkurl = self.report.build_url_fname_html(_obj.handle, "evt", True)
elif classname == "Place": elif classname == "Place":
_obj = db.get_place_from_handle(newhandle) _obj = db.get_place_from_handle(newhandle)
_name = ReportUtils.place_name(db, newhandle) _name = ReportUtils.place_name(db, newhandle)
if not _name:
_name = _("Unknown")
_linkurl = self.report.build_url_fname_html(newhandle, "plc", True) _linkurl = self.report.build_url_fname_html(newhandle, "plc", True)
# continue looking through the loop for an object... # continue looking through the loop for an object...