* src/GenericFilter.py (IsSiblingOfFilterMatch): Match only sibling, not the filterMatch; (HasEvent,HasFamilyEvent): Dont crash in filter editor.
svn: r4592
This commit is contained in:
parent
5934f15111
commit
9a1dece0db
@ -1,3 +1,8 @@
|
|||||||
|
2005-05-14 Martin Hawlisch <Martin.Hawlisch@gmx.de>
|
||||||
|
* src/GenericFilter.py (IsSiblingOfFilterMatch): Match only sibling,
|
||||||
|
not the filterMatch; (HasEvent,HasFamilyEvent): Dont crash in filter
|
||||||
|
editor.
|
||||||
|
|
||||||
2005-05-13 Don Allingham <don@gramps-project.org>
|
2005-05-13 Don Allingham <don@gramps-project.org>
|
||||||
* src/plugins/ScratchPad.py: fix GdkAtom index problem with pygtk2.4
|
* src/plugins/ScratchPad.py: fix GdkAtom index problem with pygtk2.4
|
||||||
|
|
||||||
|
@ -650,6 +650,7 @@ class IsSiblingOfFilterMatch(Rule):
|
|||||||
fam = self.db.get_family_from_handle(fam_id)
|
fam = self.db.get_family_from_handle(fam_id)
|
||||||
if fam:
|
if fam:
|
||||||
for child_handle in fam.get_child_handle_list():
|
for child_handle in fam.get_child_handle_list():
|
||||||
|
if child_handle != p_id:
|
||||||
self.map[child_handle] = 1
|
self.map[child_handle] = 1
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
@ -1074,12 +1075,12 @@ class HasEvent(Rule):
|
|||||||
|
|
||||||
labels = [ _('Personal event:'), _('Date:'), _('Place:'), _('Description:') ]
|
labels = [ _('Personal event:'), _('Date:'), _('Place:'), _('Description:') ]
|
||||||
|
|
||||||
def __init__(self,list):
|
def prepare(self,list):
|
||||||
Rule.__init__(self,list)
|
self.date = None
|
||||||
|
try:
|
||||||
if self.list and self.list[1]:
|
if self.list and self.list[1]:
|
||||||
self.date = DateHandler.parser.parse(self.list[1])
|
self.date = DateHandler.parser.parse(self.list[1])
|
||||||
else:
|
except: pass
|
||||||
self.date = None
|
|
||||||
|
|
||||||
def name(self):
|
def name(self):
|
||||||
return 'Has the personal event'
|
return 'Has the personal event'
|
||||||
@ -1127,12 +1128,12 @@ class HasFamilyEvent(Rule):
|
|||||||
|
|
||||||
labels = [ _('Family event:'), _('Date:'), _('Place:'), _('Description:') ]
|
labels = [ _('Family event:'), _('Date:'), _('Place:'), _('Description:') ]
|
||||||
|
|
||||||
def __init__(self,list):
|
def prepare(self,list):
|
||||||
Rule.__init__(self,list)
|
self.date = None
|
||||||
|
try:
|
||||||
if self.list and self.list[1]:
|
if self.list and self.list[1]:
|
||||||
self.date = DateHandler.parser.parse(self.list[1])
|
self.date = DateHandler.parser.parse(self.list[1])
|
||||||
else:
|
except: pass
|
||||||
self.date = None
|
|
||||||
|
|
||||||
def name(self):
|
def name(self):
|
||||||
return 'Has the family event'
|
return 'Has the family event'
|
||||||
|
Loading…
Reference in New Issue
Block a user