[Checkins] SVN: z3c.contents/trunk/src/z3c/contents/ Do not expose the searchterm in the table. This could stay at form and value adapter level

Roger Ineichen roger at projekt01.ch
Sat Apr 12 18:56:51 EDT 2008


Log message for revision 85298:
  Do not expose the searchterm in the table. This could stay at form and value adapter level

Changed:
  U   z3c.contents/trunk/src/z3c/contents/browser.py
  U   z3c.contents/trunk/src/z3c/contents/value.py

-=-
Modified: z3c.contents/trunk/src/z3c/contents/browser.py
===================================================================
--- z3c.contents/trunk/src/z3c/contents/browser.py	2008-04-12 22:44:38 UTC (rev 85297)
+++ z3c.contents/trunk/src/z3c/contents/browser.py	2008-04-12 22:56:51 UTC (rev 85298)
@@ -48,14 +48,16 @@
     """Search form for IContentsPage."""
 
     template = getPageTemplate()
+    prefix = 'search'
+    ignoreContext = True
+    table = None
+    searchterm = u''
+
     fields = field.Fields(field.Field(
         zope.schema.TextLine(
             title=_(u'Search'),
             description=_('Search term'),
             default=u''), 'searchterm'))
-    prefix = 'search'
-    table = None
-    ignoreContext = True
 
     @button.buttonAndHandler(_('Search'), name='search')
     def handleSearch(self, action):
@@ -63,7 +65,7 @@
         if errors:
             self.status = u'Some error message'
             return
-        self.table.searchterm = data.get('searchterm', '')
+        self.searchterm = data.get('searchterm', '')
 
 
 def queryPrincipalClipboard(request):
@@ -133,9 +135,9 @@
     allowDelete = True
     allowPaste = True
     allowRename = True
+    allowSearch = True
 
     prefix = 'contents'
-    searchterm = ''
 
     # error messages
     cutNoItemsMessage = _('No items selected for cut')

Modified: z3c.contents/trunk/src/z3c/contents/value.py
===================================================================
--- z3c.contents/trunk/src/z3c/contents/value.py	2008-04-12 22:44:38 UTC (rev 85297)
+++ z3c.contents/trunk/src/z3c/contents/value.py	2008-04-12 22:56:51 UTC (rev 85298)
@@ -106,13 +106,16 @@
             return self.context.values()
 
         # first setup and update search form
-        self.table.searchForm = browser.ContentsSearchForm(self.context,
+        searchForm = browser.ContentsSearchForm(self.context,
             self.request)
-        self.table.searchForm.table = self.table
-        self.table.searchForm.update()
+        searchForm.table = self.table
+        searchForm.update()
 
+        # expose the search form in the table for rendering
+        self.table.searchForm = searchForm
+
         # not searching
-        if not self.table.searchterm:
+        if not searchForm.searchterm:
             return self.context.values()
 
         # no search adapter for the context
@@ -122,7 +125,7 @@
             return self.context.values()
 
         # perform the search
-        searchterms = self.table.searchterm.split(' ')
+        searchterms = searchForm.searchterm.split(' ')
 
         # possible enhancement would be to look up these filters as adapters to
         # the container! Maybe we can use catalogs here?



More information about the Checkins mailing list