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

5410: Merge dialog (context) ignores role on Events section for Person objects

Browse Source 
svn: r18644
This commit is contained in:
Michiel Nauta 2011-12-20 18:52:48 +00:00
parent a4bd48c145
commit 90ebd5f2cb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Merge/mergeperson.py
View File

@ -196,10 +196,15 @@ class MergePeople(ManagedWindow.ManagedWindow):
self.add(tobj, title, _("Events"))
for event_ref in person.get_event_ref_list():
event_handle = event_ref.ref
role = event_ref.get_role()
name = str(
self.database.get_event_from_handle(event_handle).get_type())
self.add(tobj, normal, "%s:\t%s" %
(name, self.get_event_info(event_handle)))
if role.is_primary():
self.add(tobj, normal, "%s:\t%s" %
(name, self.get_event_info(event_handle)))
else:
self.add(tobj, normal, "%s (%s):\t%s" %
(name, role, self.get_event_info(event_handle)))
plist = person.get_parent_family_handle_list()
if len(plist) > 0: