Make navigation labels consistent

svn: r14239
This commit is contained in:
Nick Hall 2010-02-05 23:29:38 +00:00
parent be652658d1
commit ad0f8a48cb

View File

@ -1350,12 +1350,13 @@ def navigation_label(db, nav_type, handle):
elif nav_type == 'Event': elif nav_type == 'Event':
obj = db.get_event_from_handle(handle) obj = db.get_event_from_handle(handle)
if obj: if obj:
type = obj.get_type()
who = get_participant_from_event(db, handle) who = get_participant_from_event(db, handle)
desc = obj.get_description() desc = obj.get_description()
label = '%s - %s' % (type, who) label = obj.get_type()
if desc: if desc:
label = '%s - %s' % (label, desc) label = '%s - %s' % (label, desc)
if who:
label = '%s - %s' % (label, who)
elif nav_type == 'Place': elif nav_type == 'Place':
obj = db.get_place_from_handle(handle) obj = db.get_place_from_handle(handle)
if obj: if obj: