diff --git a/tabellio/searchform/configure.zcml b/tabellio/searchform/configure.zcml index 3e52e92..c76a50c 100644 --- a/tabellio/searchform/configure.zcml +++ b/tabellio/searchform/configure.zcml @@ -62,7 +62,8 @@ for="Products.CMFPlone.interfaces.IPloneSiteRoot" name="search2" class=".simple.SimpleSearchView" - permission="zope2.View"/> + permission="zope2.View" + template="simple.pt"/> - + + + + + + +
- - + +
-

Députés ()

+

Députés

+
+ Nombre de résultats : + Filtre avancé +
    - +

  • Véronique Salvi

    +

    + Groupe politique : + + - + Arrondissement : + + + - + Ce député ne siège plus. + +

+ +
+
+
+
-

Documents et dossiers ()

+

Documents et dossiers

+
+ Nombre de résultats : + Filtre avancé +
- - - « - - Previous - n - items - - - - - - - - Next - n - items - - » - - +
+
+
-

Événements ()

+

Événements

+
+ Nombre de résultats : + Filtre avancé +
    @@ -93,10 +105,18 @@
+ +
+
+
+
-

Ailleurs sur le site ()

+

Ailleurs sur le site

+
+ Nombre de résultats : +
    @@ -108,7 +128,16 @@
+ +
+
+
+
+
+ + + diff --git a/tabellio/searchform/simple.py b/tabellio/searchform/simple.py index e004ab1..8402e0a 100644 --- a/tabellio/searchform/simple.py +++ b/tabellio/searchform/simple.py @@ -13,62 +13,51 @@ from tabellio.searchform.interfaces import MessageFactory as _ from Products.Five import BrowserView from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile -class ISearch(interface.Interface): - SearchableText = schema.TextLine(title=_(u'Text'), required=False) +class SimpleSearchView(BrowserView): + batch_macros = ViewPageTemplateFile('batch_macros.pt') + def deputy_form_url(self): + return '#' -class SearchForm(form.Form): - fields = field.Fields(ISearch) - ignoreContext = True - template = ViewPageTemplateFile('simple_templates/view_effectivesearch.pt') + def docdos_form_url(self): + return '#' + + def event_form_url(self): + return '#' def deputy_results(self): catalog = getToolByName(self.context, 'portal_catalog') - data, errors = self.extractData() - if data.get('SearchableText') is None: + if not self.request.form.get('SearchableText'): return [] return catalog( portal_type=['themis.datatypes.deputy'], - SearchableText=data.get('SearchableText'), - sort_on="sortable_title", sort_order='ascending', sort_limit=20) + SearchableText=self.request.form.get('SearchableText'), + sort_on="sortable_title", sort_order='ascending') def page_results(self): catalog = getToolByName(self.context, 'portal_catalog') - data, errors = self.extractData() - if data.get('SearchableText') is None: + if not self.request.form.get('SearchableText'): return [] return catalog( portal_type=['Document', 'File', 'Folder', 'Link'], - SearchableText=data.get('SearchableText'), - sort_on='created', sort_order='descending', sort_limit=20) + SearchableText=self.request.form.get('SearchableText'), + sort_on='created', sort_order='descending') def doc_results(self): catalog = getToolByName(self.context, 'portal_catalog') - data, errors = self.extractData() - if data.get('SearchableText') is None: + if not self.request.form.get('SearchableText'): return [] return catalog( portal_type=['tabellio.documents.dossier', 'tabellio.documents.document', 'tabellio.documents.question'], - SearchableText=data.get('SearchableText')) + SearchableText=self.request.form.get('SearchableText')) def event_results(self): catalog = getToolByName(self.context, 'portal_catalog') - data, errors = self.extractData() - if data.get('SearchableText') is None: + if not self.request.form.get('SearchableText'): return [] return catalog( portal_type=['tabellio.agenda.parlevent', 'tabellio.agenda.event'], - SearchableText=data.get('SearchableText')) - - @button.buttonAndHandler(u'Search') - def handleApply(self, action): - data, errors = self.extractData() - if not errors: - plone_utils = getToolByName(self.context, 'plone_utils') - plone_utils.addPortalMessage(_('Your search has been completed!')) - return - -SimpleSearchView = wrap_form(SearchForm) + SearchableText=self.request.form.get('SearchableText')) diff --git a/tabellio/searchform/simple_templates/view.pt b/tabellio/searchform/simple_templates/view.pt deleted file mode 100644 index 9ea6852..0000000 --- a/tabellio/searchform/simple_templates/view.pt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -
-

-
- -
- -
- - - - - -