From c07c19dfe34bb11fe77616cb30bce9b8fc568ede Mon Sep 17 00:00:00 2001 From: Michiel Nauta Date: Sun, 22 May 2011 12:40:37 +0000 Subject: [PATCH] 4921: Want a "Main Participants" entry in sidebar eventfilter; cleanup svn: r17549 --- src/Filters/Rules/Family/_HasEvent.py | 12 ++++++++---- src/Filters/Rules/MediaObject/_HasMedia.py | 2 +- src/Filters/Rules/Note/_HasNote.py | 2 +- src/Filters/Rules/Person/_HasEvent.py | 15 ++++++++++----- src/Filters/Rules/Place/_HasPlace.py | 2 +- src/Filters/Rules/Repository/_HasRepo.py | 2 +- src/Filters/Rules/Source/_HasSource.py | 2 +- src/Filters/Rules/_HasEventBase.py | 2 +- src/Filters/SideBar/_FamilySidebarFilter.py | 2 +- src/Filters/SideBar/_PersonSidebarFilter.py | 2 +- 10 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/Filters/Rules/Family/_HasEvent.py b/src/Filters/Rules/Family/_HasEvent.py index f7b9386c2..62a593560 100644 --- a/src/Filters/Rules/Family/_HasEvent.py +++ b/src/Filters/Rules/Family/_HasEvent.py @@ -20,6 +20,9 @@ # $Id$ +""" +Filter rule to match families with a particular event. +""" #------------------------------------------------------------------------- # # Standard Python modules @@ -45,15 +48,16 @@ class HasEvent(HasEventBase): labels = [ _('Family event:'), _('Date:'), _('Place:'), - _('Description:') ] + _('Description:'), + _('Main Participants') ] name = _('Families with the ') description = _("Matches families with an event of a particular value") - def apply(self,db,family): + def apply(self, dbase, family): for event_ref in family.get_event_ref_list(): if not event_ref: continue - event = db.get_event_from_handle(event_ref.ref) - if HasEventBase.apply(self,db,event): + event = dbase.get_event_from_handle(event_ref.ref) + if HasEventBase.apply(self, dbase, event): return True return False diff --git a/src/Filters/Rules/MediaObject/_HasMedia.py b/src/Filters/Rules/MediaObject/_HasMedia.py index 4e548d876..c80238bbb 100644 --- a/src/Filters/Rules/MediaObject/_HasMedia.py +++ b/src/Filters/Rules/MediaObject/_HasMedia.py @@ -37,7 +37,7 @@ from Filters.Rules._Rule import Rule #------------------------------------------------------------------------- # -# HasEvent +# HasMedia # #------------------------------------------------------------------------- class HasMedia(Rule): diff --git a/src/Filters/Rules/Note/_HasNote.py b/src/Filters/Rules/Note/_HasNote.py index 007fce181..806219c5c 100644 --- a/src/Filters/Rules/Note/_HasNote.py +++ b/src/Filters/Rules/Note/_HasNote.py @@ -37,7 +37,7 @@ from Filters.Rules._Rule import Rule #------------------------------------------------------------------------- # -# HasEvent +# HasNote # #------------------------------------------------------------------------- class HasNote(Rule): diff --git a/src/Filters/Rules/Person/_HasEvent.py b/src/Filters/Rules/Person/_HasEvent.py index f5a3be11f..4092bd53e 100644 --- a/src/Filters/Rules/Person/_HasEvent.py +++ b/src/Filters/Rules/Person/_HasEvent.py @@ -20,6 +20,9 @@ # $Id$ +""" +Filter rule to match persons with a particular event. +""" #------------------------------------------------------------------------- # # Standard Python modules @@ -46,18 +49,20 @@ class HasEvent(HasEventBase): labels = [ _('Personal event:'), _('Date:'), _('Place:'), - _('Description:') ] + _('Description:'), + _('Main Participants') ] name = _('People with the personal ') - description = _("Matches people with a personal event of a particular value") + description = _("Matches people with a personal event of a particular " + "value") - def apply(self,db,person): + def apply(self, dbase, person): for event_ref in person.get_event_ref_list(): if not event_ref: continue if event_ref.role != EventRoleType.PRIMARY: # Only match primaries, no witnesses continue - event = db.get_event_from_handle(event_ref.ref) - if HasEventBase.apply(self,db,event): + event = dbase.get_event_from_handle(event_ref.ref) + if HasEventBase.apply(self, dbase, event): return True return False diff --git a/src/Filters/Rules/Place/_HasPlace.py b/src/Filters/Rules/Place/_HasPlace.py index f4581944b..de043e15e 100644 --- a/src/Filters/Rules/Place/_HasPlace.py +++ b/src/Filters/Rules/Place/_HasPlace.py @@ -38,7 +38,7 @@ from Filters.Rules._Rule import Rule #------------------------------------------------------------------------- # -# HasEvent +# HasPlace # #------------------------------------------------------------------------- class HasPlace(Rule): diff --git a/src/Filters/Rules/Repository/_HasRepo.py b/src/Filters/Rules/Repository/_HasRepo.py index 8ea507e3d..9fc9b94d2 100644 --- a/src/Filters/Rules/Repository/_HasRepo.py +++ b/src/Filters/Rules/Repository/_HasRepo.py @@ -37,7 +37,7 @@ from Filters.Rules._Rule import Rule #------------------------------------------------------------------------- # -# HasEvent +# HasRepo # #------------------------------------------------------------------------- class HasRepo(Rule): diff --git a/src/Filters/Rules/Source/_HasSource.py b/src/Filters/Rules/Source/_HasSource.py index 5a12e341f..ea2e3c01c 100644 --- a/src/Filters/Rules/Source/_HasSource.py +++ b/src/Filters/Rules/Source/_HasSource.py @@ -36,7 +36,7 @@ from Filters.Rules._Rule import Rule #------------------------------------------------------------------------- # -# HasEvent +# HasSource # #------------------------------------------------------------------------- class HasSource(Rule): diff --git a/src/Filters/Rules/_HasEventBase.py b/src/Filters/Rules/_HasEventBase.py index 12e1118ed..a388efe7e 100644 --- a/src/Filters/Rules/_HasEventBase.py +++ b/src/Filters/Rules/_HasEventBase.py @@ -39,7 +39,7 @@ from Utils import get_participant_from_event #------------------------------------------------------------------------- # -# HasEvent +# HasEventBase # #------------------------------------------------------------------------- class HasEventBase(Rule): diff --git a/src/Filters/SideBar/_FamilySidebarFilter.py b/src/Filters/SideBar/_FamilySidebarFilter.py index 64684ee03..68510d3f1 100644 --- a/src/Filters/SideBar/_FamilySidebarFilter.py +++ b/src/Filters/SideBar/_FamilySidebarFilter.py @@ -177,7 +177,7 @@ class FamilySidebarFilter(SidebarFilter): generic_filter.add_rule(rule) if etype: - rule = HasEvent([etype, u'', u'', u'']) + rule = HasEvent([etype, u'', u'', u'', u'']) generic_filter.add_rule(rule) if rtype: diff --git a/src/Filters/SideBar/_PersonSidebarFilter.py b/src/Filters/SideBar/_PersonSidebarFilter.py index 86bb3c26f..5c1758936 100644 --- a/src/Filters/SideBar/_PersonSidebarFilter.py +++ b/src/Filters/SideBar/_PersonSidebarFilter.py @@ -206,7 +206,7 @@ class PersonSidebarFilter(SidebarFilter): # Build an event filter if needed if etype: - rule = HasEvent([etype, u'', u'', u'']) + rule = HasEvent([etype, u'', u'', u'', u'']) generic_filter.add_rule(rule) # Build birth event filter if needed