* src/GenericFilter.py: Fix uninitialized ancestor_cache in
HasCommonAncestorWithFilterMatch, fix or-ing filters svn: r4878
This commit is contained in:
parent
daf98ee2c7
commit
ccfd1e57b4
@ -1,3 +1,7 @@
|
|||||||
|
2005-06-26 Julio Sanchez <jsanchez@users.sourceforge.net>
|
||||||
|
* src/GenericFilter.py: Fix uninitialized ancestor_cache in
|
||||||
|
HasCommonAncestorWithFilterMatch, fix or-ing filters
|
||||||
|
|
||||||
2005-06-24 Martin Hawlisch <Martin.Hawlisch@gmx.de>
|
2005-06-24 Martin Hawlisch <Martin.Hawlisch@gmx.de>
|
||||||
* src/PeopleView.py (build_people_context_menu): Workaround to get a
|
* src/PeopleView.py (build_people_context_menu): Workaround to get a
|
||||||
proper german translation.
|
proper german translation.
|
||||||
|
@ -956,6 +956,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith):
|
|||||||
|
|
||||||
def __init__(self,list):
|
def __init__(self,list):
|
||||||
HasCommonAncestorWith.__init__(self,list)
|
HasCommonAncestorWith.__init__(self,list)
|
||||||
|
self.ancestor_cache = {}
|
||||||
|
|
||||||
def init_ancestor_cache(self,db):
|
def init_ancestor_cache(self,db):
|
||||||
filt = MatchesFilter(self.list)
|
filt = MatchesFilter(self.list)
|
||||||
@ -1949,7 +1950,7 @@ class GenericFilter:
|
|||||||
count += 1
|
count += 1
|
||||||
return count != 1
|
return count != 1
|
||||||
|
|
||||||
def and_or(self,db,person):
|
def or_test(self,db,person):
|
||||||
for rule in self.flist:
|
for rule in self.flist:
|
||||||
if rule.apply(db,person):
|
if rule.apply(db,person):
|
||||||
return True
|
return True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user