Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trap FilterError when creating and testing a new filter

Browse Source
This commit is contained in:
Paul Franklin 2016-12-06 11:57:16 -08:00
parent 2c454268a1
commit d407c2fb6b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gramps/gui/editors/filtereditor.py
View File

@ -58,10 +58,10 @@ from gramps.gen.filters import (GenericFilterFactory, FilterList,
from gramps.gen.filters.rules._matchesfilterbase import MatchesFilterBase from gramps.gen.filters.rules._matchesfilterbase import MatchesFilterBase
from ..listmodel import ListModel from ..listmodel import ListModel
from ..managedwindow import ManagedWindow from ..managedwindow import ManagedWindow
from ..dialog import QuestionDialog from ..dialog import QuestionDialog, ErrorDialog
from gramps.gen.const import RULE_GLADE, URL_MANUAL_PAGE from gramps.gen.const import RULE_GLADE, URL_MANUAL_PAGE
from ..display import display_help from ..display import display_help
from gramps.gen.errors import WindowActiveError from gramps.gen.errors import WindowActiveError, FilterError
from gramps.gen.lib import (AttributeType, EventType, FamilyRelType, from gramps.gen.lib import (AttributeType, EventType, FamilyRelType,
NameOriginType, NameType, NoteType, PlaceType) NameOriginType, NameType, NoteType, PlaceType)
from gramps.gen.filters import rules from gramps.gen.filters import rules
@ -1167,7 +1167,12 @@ class FilterEditor(ManagedWindow):
store, node = self.clist.get_selected() store, node = self.clist.get_selected()
if node: if node:
filt = self.clist.get_object(node) filt = self.clist.get_object(node)
handle_list = filt.apply(self.db, self.get_all_handles()) try:
handle_list = filt.apply(self.db, self.get_all_handles())
except FilterError as msg:
(msg1, msg2) = msg.messages()
ErrorDialog(msg1, msg2, parent=self.window)
return
ShowResults(self.db, self.uistate, self.track, handle_list, ShowResults(self.db, self.uistate, self.track, handle_list,
filt.get_name(),self.namespace) filt.get_name(),self.namespace)