From 70469e91f53507f8170de56e4008e02d243caa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 21 Oct 2011 17:53:16 +0200 Subject: [PATCH] simple: do not search if there's no criteria --- tabellio/searchform/simple.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tabellio/searchform/simple.py b/tabellio/searchform/simple.py index 4ab12dc..3f1da94 100644 --- a/tabellio/searchform/simple.py +++ b/tabellio/searchform/simple.py @@ -25,6 +25,8 @@ class SearchForm(form.Form): def deputy_results(self): catalog = getToolByName(self.context, 'portal_catalog') data, errors = self.extractData() + if data.get('SearchableText') is None: + return [] return catalog( portal_type=['themis.datatypes.deputy'], SearchableText=data.get('SearchableText')) @@ -32,6 +34,8 @@ class SearchForm(form.Form): def page_results(self): catalog = getToolByName(self.context, 'portal_catalog') data, errors = self.extractData() + if data.get('SearchableText') is None: + return [] return catalog( portal_type=['Document', 'File', 'Folder', 'Link'], SearchableText=data.get('SearchableText')) @@ -39,6 +43,8 @@ class SearchForm(form.Form): def doc_results(self): catalog = getToolByName(self.context, 'portal_catalog') data, errors = self.extractData() + if data.get('SearchableText') is None: + return [] return catalog( portal_type=['tabellio.documents.dossier', 'tabellio.documents.document'], SearchableText=data.get('SearchableText')) @@ -46,6 +52,8 @@ class SearchForm(form.Form): def event_results(self): catalog = getToolByName(self.context, 'portal_catalog') data, errors = self.extractData() + if data.get('SearchableText') is None: + return [] return catalog( portal_type=['tabellio.agenda.parlevent', 'tabellio.agenda.event'], SearchableText=data.get('SearchableText'))