From ab775a6529090e7f1239ea07f998da909ba3fb0c Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sat, 5 Aug 2006 04:18:19 +0000 Subject: [PATCH] Update svn: r7130 --- gramps2/src/FilterEditor/_EditRule.py | 8 +++++--- gramps2/src/FilterEditor/_ShowResults.py | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gramps2/src/FilterEditor/_EditRule.py b/gramps2/src/FilterEditor/_EditRule.py index cba7d429b..dbd0bb8b5 100644 --- a/gramps2/src/FilterEditor/_EditRule.py +++ b/gramps2/src/FilterEditor/_EditRule.py @@ -367,10 +367,12 @@ class EditRule(ManagedWindow.ManagedWindow): self.class2page = {} the_map = {} - if self.space == "Family": - class_list = Rules.Family.editor_rule_list - else: + if self.space == "Person": class_list = Rules.Person.editor_rule_list + elif self.space == "Family": + class_list = Rules.Family.editor_rule_list + elif self.space == "Event": + class_list = Rules.Event.editor_rule_list for class_obj in class_list: arglist = class_obj.labels diff --git a/gramps2/src/FilterEditor/_ShowResults.py b/gramps2/src/FilterEditor/_ShowResults.py index b077359a7..b5ad68e1c 100644 --- a/gramps2/src/FilterEditor/_ShowResults.py +++ b/gramps2/src/FilterEditor/_ShowResults.py @@ -111,6 +111,10 @@ class ShowResults(ManagedWindow.ManagedWindow): family = self.db.get_family_from_handle(handle) name = Utils.family_name(family,self.db) gid = family.get_gramps_id() + elif self.space == 'Event': + event = self.db.get_event_from_handle(handle) + name = event.get_description() + gid = event.get_gramps_id() return (name,gid) def sort_val_from_handle(self, handle): @@ -121,4 +125,7 @@ class ShowResults(ManagedWindow.ManagedWindow): name = Utils.family_name( self.db.get_family_from_handle(handle),self.db) sortname = locale.strxfrm(name) + elif self.space == 'Event': + name = self.db.get_event_from_handle(handle).get_description() + sortname = locale.strxfrm(name) return (sortname,handle)