From 7c9539ca4c7433da5e6596f32ab5b3bf4d675fa1 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 7 May 2006 04:24:23 +0000 Subject: [PATCH] * src/PluginUtils/_ReportUtils.py: fix set_nick_name * src/RelLib/_MediaRef.py: handle initialization of Ref object svn: r6568 --- gramps2/ChangeLog | 2 ++ gramps2/src/PluginUtils/_ReportUtils.py | 2 -- gramps2/src/RelLib/_MediaRef.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 5d2c3d292..9a759b6be 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-05-06 Don Allingham + * src/PluginUtils/_ReportUtils.py: fix set_nick_name + * src/RelLib/_MediaRef.py: handle initialization of Ref object * src/DataViews/_PersonView.py: handle filter option correctly * src/DisplayTabs/_SourceEmbedList.py: fix icon * src/DisplayState.py: add relationship calculator option to statusbar diff --git a/gramps2/src/PluginUtils/_ReportUtils.py b/gramps2/src/PluginUtils/_ReportUtils.py index f4fa8fe99..ac6500ffc 100644 --- a/gramps2/src/PluginUtils/_ReportUtils.py +++ b/gramps2/src/PluginUtils/_ReportUtils.py @@ -1110,8 +1110,6 @@ def sanitize_person(db,person): if name.get_privacy() or person.get_privacy(): name = RelLib.Name() name.set_surname(_('Private')) - else: - new_person.set_nick_name(person.get_nick_name()) new_person.set_primary_name(name) # copy Family reference list diff --git a/gramps2/src/RelLib/_MediaRef.py b/gramps2/src/RelLib/_MediaRef.py index 8aef2fb21..83105aef4 100644 --- a/gramps2/src/RelLib/_MediaRef.py +++ b/gramps2/src/RelLib/_MediaRef.py @@ -50,7 +50,7 @@ class MediaRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase, PrivacyBase.__init__(self,source) SourceBase.__init__(self,source) NoteBase.__init__(self,source) - RefBase.__init__(self) + RefBase.__init__(self,source) AttributeBase.__init__(self,source) if source: