[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - tweaking
Yvo Schubbe
cvs-admin at zope.org
Fri May 10 09:11:55 UTC 2013
Log message for revision 130234:
- tweaking
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst
U Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst 2013-05-09 06:12:39 UTC (rev 130233)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst 2013-05-10 09:11:53 UTC (rev 130234)
@@ -1,9 +1,12 @@
Converting skins to views:
==========================
-[/] ISiteRoot @@search.html:
+[x] ISiteRoot @@search_form.html:
+---------------------------------
+- [x] search_form.py -> search.Search
+- [x] search_form_template.pt -> search.pt
+
+[x] ISiteRoot @@search.html:
----------------------------
-- [ ] search_form.py -> search.Search
-- [ ] search_form_template.pt -> search.pt
-- [ ] search.py -> search.Search
-- [ ] search_results_template.pt -> search_results.pt
+- [x] search.py -> search.SearchView
+- [x] search_results_template.pt -> search_results.pt
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py 2013-05-09 06:12:39 UTC (rev 130233)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py 2013-05-10 09:11:53 UTC (rev 130234)
@@ -20,6 +20,7 @@
from .interfaces import ISearchSchema
from Products.CMFCore.interfaces import ICatalogTool
+from Products.CMFDefault.browser.utils import decode
from Products.CMFDefault.browser.utils import memoize
from Products.CMFDefault.browser.widgets.batch import BatchViewBase
from Products.CMFDefault.formlib.form import EditFormBase
@@ -85,8 +86,8 @@
def _getNavigationVars(self):
kw = self.request.form.copy()
for k, v in kw.items():
- if k in ('review_state', 'Title', 'Subject', 'Description',
- 'portal_type', 'listCreators'):
+ if k in ('review_state', 'SearchableText', 'Title', 'Subject',
+ 'Description', 'portal_type', 'listCreators'):
if isinstance(v, (list, tuple)):
v = filter(None, v)
if not v:
@@ -99,12 +100,6 @@
kw[k] = v.copy()
elif k in ('go', 'go.x', 'go.y'):
del kw[k]
- elif k == 'SearchableText':
- v = ' '.join([ w.strip('_-.@') for w in v.split() ])
- if v:
- kw[k] = v
- else:
- del kw[k]
return kw
@memoize
@@ -115,12 +110,14 @@
# interface
@memoize
+ @decode
def listBatchItems(self):
- return ({'description': item.Description,
- 'icon': item.getIconURL,
- 'title': item.Title,
- 'type': item.Type,
- 'date': item.Date,
- 'url': item.getURL(),
- 'format': None}
- for item in self._getBatchObj())
+ items = [ {'description': item.Description,
+ 'icon': item.getIconURL,
+ 'title': item.Title,
+ 'type': item.Type,
+ 'date': item.Date,
+ 'url': item.getURL(),
+ 'format': None}
+ for item in self._getBatchObj() ]
+ return tuple(items)
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py 2013-05-09 06:12:39 UTC (rev 130233)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py 2013-05-10 09:11:53 UTC (rev 130234)
@@ -43,7 +43,6 @@
length = batch_obj.sequence_length
summary = { 'length': length and thousands_commas(length) or '',
- 'l2': length,
'type': (length == 1) and _(u'item') or _(u'items'),
'match': kw.get('SearchableText') }
navigation = context.getBatchNavigation(batch_obj, target, **kw)
More information about the checkins
mailing list