merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -22,6 +22,7 @@ Fixed:
 - retain Boolean selections in edit error handling (sf bug 1101492)
 - fix initialisation of logging module from config file (sf bug 1108577)
 - removed rlog module (py 2.3 is minimum version now)
+- fixed class "help" listing paging (sf bug 1106329)
 
 
 2005-01-13 0.8.0b2
@@ -94,6 +95,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

@@ -2056,7 +2056,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
@@ -2087,7 +2087,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))

templates/classic/html/_generic.help.html

@@ -42,6 +42,7 @@
            tal:attributes="href python:request.indexargs_url(request.classname,
            {'@template':'help', 'property': request.form['property'].value,
             'properties': request.form['properties'].value,
+            'form': request.form['form'].value,
             '@startwith':prev.first, '@pagesize':prev.size})"
            i18n:translate="" >&lt;&lt; previous</a>
         &nbsp;
@@ -56,6 +57,7 @@
            tal:attributes="href python:request.indexargs_url(request.classname,
            {'@template':'help', 'property': request.form['property'].value,
             'properties': request.form['properties'].value,
+            'form': request.form['form'].value,
             '@startwith':next.first, '@pagesize':next.size})"
            i18n:translate="" >next &gt;&gt;</a>
         &nbsp;

templates/minimal/html/_generic.help.html

@@ -42,6 +42,7 @@
            tal:attributes="href python:request.indexargs_href(request.classname,
            {'@template':'help', 'property': request.form['property'].value,
             'properties': request.form['properties'].value,
+            'form': request.form['form'].value,
             '@startwith':prev.first, '@pagesize':prev.size})"
            i18n:translate="" >&lt;&lt; previous</a>
         &nbsp;
@@ -56,6 +57,7 @@
            tal:attributes="href python:request.indexargs_href(request.classname,
            {'@template':'help', 'property': request.form['property'].value,
             'properties': request.form['properties'].value,
+            'form': request.form['form'].value,
             '@startwith':next.first, '@pagesize':next.size})"
            i18n:translate="" >next &gt;&gt;</a>
         &nbsp;