From cd6ab43fc06e233f22e6515316fbc3ff95113cec Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 18 Aug 2006 04:43:03 +0000 Subject: [PATCH] 2006-08-17 Don Allingham * src/DataViews/_PersonView.py: apply filter to calcuated data before deleting a person from the list svn: r7199 --- ChangeLog | 4 ++++ src/DataViews/_PersonView.py | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 60c855935..d23e44635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-08-17 Don Allingham + * src/DataViews/_PersonView.py: apply filter to calcuated data before + deleting a person from the list + 2006-08-17 Brian Matherly * src/plugins/NarrativeWeb.py: fix #0000349: NarrativeWebsite sorting diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index 055296eb5..747b2964e 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -677,12 +677,17 @@ class PersonView(PageView.PersonNavView): if not self.model: return + if Config.get(Config.FILTER): + filter_info = (PeopleModel.GENERIC, self.generic_filter) + else: + filter_info = (PeopleModel.SEARCH, self.search_bar.get_value()) + self.model.clear_cache() for node in handle_list: person = self.dbstate.db.get_person_from_handle(node) top = person.get_primary_name().get_group_name() mylist = self.model.sname_sub.get(top,[]) - self.model.calculate_data(skip=set(handle_list)) + self.model.calculate_data(filter_info[1], skip=set(handle_list)) if mylist: try: path = self.model.on_get_path(node)