diff --git a/tabellio/searchform/advsearch-pfb.pt b/tabellio/searchform/advsearch-pfb.pt index cecf3c1..2d4ca4c 100644 --- a/tabellio/searchform/advsearch-pfb.pt +++ b/tabellio/searchform/advsearch-pfb.pt @@ -31,15 +31,15 @@

Documents

-
+

Événements

-
- ... + +
@@ -122,7 +122,7 @@ function setup_sort_on(index, elem) $('#formfield-document-widgets-l_doctypes').each(setup_appearance); $('#formfield-document-widgets-l_topics').each(setup_appearance); $('#formfield-document-widgets-l_polgroups').each(setup_appearance); - $('#formfield-document-widgets-sort_on').each(setup_sort_on); + $('#formfield-document-widgets-sort_on').hide(); $('div.advbox form').hide(); $('div.advbox h2').click(function() { $(this).parent().find('form').toggle(); }); }); diff --git a/tabellio/searchform/form.py b/tabellio/searchform/form.py index 7fdf45b..53e136c 100644 --- a/tabellio/searchform/form.py +++ b/tabellio/searchform/form.py @@ -744,7 +744,6 @@ class SearchView(BrowserView): data, errors = f.extractData() kw = {} - print data if not data.get('search_type_is_event'): return None @@ -765,13 +764,13 @@ class SearchView(BrowserView): catalog = getToolByName(self.context, 'portal_catalog') return catalog(**kw) - - def pfbdocform_url(self): + def docform_url(self): catalog = getToolByName(self.context, 'portal_catalog') try: return catalog( portal_type='Folder', - object_provides='tabellio.searchform.form.IFolderWithPfbDocuments', + object_provides=('tabellio.searchform.form.IFolderWithPfbDocuments', + 'tabellio.searchform.form.IFolderWithDocuments'), limit=1)[0].getObject().absolute_url() except IndexError: return '#' @@ -788,6 +787,9 @@ class SearchView(BrowserView): except IndexError: return '#' + def eventform_url(self): + return self.portal_url() + '/eventsearch' + class Reflex(BrowserView): def __call__(self): diff --git a/tabellio/searchform/simple-pfb.pt b/tabellio/searchform/simple-pfb.pt index 74c5495..f55ff5f 100644 --- a/tabellio/searchform/simple-pfb.pt +++ b/tabellio/searchform/simple-pfb.pt @@ -9,7 +9,9 @@ -

Page de résultats

+

Page de résultats

+

Recherche

+ Recherche avancée
+
+ + +
+

Députés

diff --git a/tabellio/searchform/simple.py b/tabellio/searchform/simple.py index 4f9dcad..24d2fb1 100644 --- a/tabellio/searchform/simple.py +++ b/tabellio/searchform/simple.py @@ -17,13 +17,33 @@ class SimpleSearchView(BrowserView): batch_macros = ViewPageTemplateFile('batch_macros.pt') def deputy_form_url(self): - return '#' + catalog = getToolByName(self.context, 'portal_catalog') + try: + return catalog( + portal_type='Folder', + object_provides=('tabellio.webviews.deputy.IDeputiesAndOthersFolderView', + 'tabellio.webviews.deputy.IPfbDeputiesFolderView', + 'tabellio.webviews.deputy.IFolderView'), + limit=1)[0].getObject().absolute_url() + except IndexError: + return '#' def docdos_form_url(self): - return '#' + catalog = getToolByName(self.context, 'portal_catalog') + try: + return catalog( + portal_type='Folder', + object_provides=('tabellio.searchform.form.IFolderWithPfbDocuments', + 'tabellio.searchform.form.IFolderWithDocuments'), + limit=1)[0].getObject().absolute_url() + except IndexError: + return '#' + + def portal_url(self): + return getToolByName(self.context, 'portal_url').getPortalPath() def event_form_url(self): - return '#' + return self.portal_url() + '/eventsearch' def deputy_results(self): catalog = getToolByName(self.context, 'portal_catalog')