merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -9,6 +9,7 @@ Fixed:
 - fixed problem migrating mysql databases
 - fix search_checkboxes macro (sf patch 1113828)
 - fix bug in date editing in Metakit
+- allow suppression of search_text in indexargs_form (sf bug 1101548)
 
 
 2005-01-06 0.7.11

roundup/cgi/templating.py

@@ -1977,7 +1977,7 @@ def __str__(self):
 '''%d
 
     def indexargs_form(self, columns=1, sort=1, group=1, filter=1,
-            filterspec=1):
+            filterspec=1, search_text=1):
         ''' return the current index args as form elements '''
         l = []
         sc = self.special_char
@@ -2008,7 +2008,7 @@ def indexargs_form(self, columns=1, sort=1, group=1, filter=1,
                         l.append(s%(k, ','.join(v)))
                 else:
                     l.append(s%(k, v))
-        if self.search_text:
+        if search_text and self.search_text:
             l.append(s%(sc+'search_text', self.search_text))
         l.append(s%(sc+'pagesize', self.pagesize))
         l.append(s%(sc+'startwith', self.startwith))