[Plone-cvs] r34437 - in Plone/trunk: Products/CMFPlone/skins/plone_templates docs

[Craig A. H. <svn...@pl...>]

Author: cah190
Date: Mon Mar  1 20:53:01 2010
New Revision: 34437

Modified:
   Plone/trunk/Products/CMFPlone/skins/plone_templates/batch_macros.pt
   Plone/trunk/docs/CHANGES.txt
Log:
Added batchformkeys "parameter" to batch_macros.pt to allow for cleaner batch navigation links.


Modified: Plone/trunk/Products/CMFPlone/skins/plone_templates/batch_macros.pt
==============================================================================
--- Plone/trunk/Products/CMFPlone/skins/plone_templates/batch_macros.pt	(original)
+++ Plone/trunk/Products/CMFPlone/skins/plone_templates/batch_macros.pt	Mon Mar  1 20:53:01 2010
@@ -9,6 +9,8 @@
      metal:define-macro="navigation"
      tal:define="request request|context/request|container/request|nothing;
                  batch batch|nothing;
+                 batchformkeys batchformkeys|nothing;
+                 batchlinkparams python:batchformkeys and dict([(key, request.form[key]) for key in batchformkeys if key in request]) or request.form;
                  template_id template_id|template/getId;
                  mq python:modules['ZTUtils'].make_query;
                  url batch_base_url | string:${context/absolute_url}/${template_id};
@@ -19,7 +21,7 @@
       tal:define="p batch/previous | nothing"
       tal:condition="p">
         <a href=""
-           tal:attributes="href python: '%s?%s' % (url , mq( request.form, {batch.b_start_str:p.first} ))">
+           tal:attributes="href python: '%s?%s' % (url , mq( batchlinkparams, {batch.b_start_str:p.first} ))">
            &laquo;
            <span i18n:translate="batch_previous_x_items" tal:omit-tag="">
                Previous
@@ -33,7 +35,7 @@
       tal:define="n batch/next | nothing"
       tal:condition="n">
         <a href=""
-           tal:attributes="href python: '%s?%s' % (url , mq( request.form, {batch.b_start_str:n.first} ))">
+           tal:attributes="href python: '%s?%s' % (url , mq( batchlinkparams, {batch.b_start_str:n.first} ))">
            <span i18n:translate="batch_next_x_items" tal:omit-tag="">
                Next
                <span i18n:name="number" tal:omit-tag="" tal:content="n/length">n</span>
@@ -48,7 +50,7 @@
     </tal:comment>
     <span tal:condition="python: 1 not in batch.navlist">
         <a href=""
-           tal:attributes="href python: '%s?%s' % (url, batch.pageurl(request.form,1));">1</a>
+           tal:attributes="href python: '%s?%s' % (url, batch.pageurl(batchlinkparams,1));">1</a>
         <span tal:condition="python: 2 not in (batch.prevlist or batch.leapback)"
               tal:omit-tag="">
            &hellip;
@@ -58,7 +60,7 @@
     <tal:comment tal:condition="nothing">
       Pagelist with quantum leap links to previous pages for quick navigation
     </tal:comment>
-    <span tal:repeat="linklist python:batch.navurls(request.form, batch.leapback)"
+    <span tal:repeat="linklist python:batch.navurls(batchlinkparams, batch.leapback)"
           tal:condition="batch/leapback"
           tal:omit-tag="" >
         <a href=""
@@ -73,7 +75,7 @@
     <tal:comment tal:condition="nothing">
       Pagelist with links to previous pages for quick navigation
     </tal:comment>
-    <span tal:repeat="linklist python:batch.prevurls(request.form)"
+    <span tal:repeat="linklist python:batch.prevurls(batchlinkparams)"
           tal:condition="batch/prevlist"
           tal:omit-tag="" >
         <a href=""
@@ -93,7 +95,7 @@
     <tal:comment tal:replace="nothing">
       Pagelist with links to next pages for quick navigation
     </tal:comment>
-    <span tal:repeat="linklist python:batch.nexturls(request.form)"
+    <span tal:repeat="linklist python:batch.nexturls(batchlinkparams)"
           tal:condition="batch/nextlist"
           tal:omit-tag="" >
         <a href=""
@@ -107,7 +109,7 @@
     <tal:comment tal:replace="nothing">
       Pagelist with quantum leap links to next pages for quick navigation
     </tal:comment>
-    <span tal:repeat="linklist python:batch.navurls(request.form, batch.leapforward)"
+    <span tal:repeat="linklist python:batch.navurls(batchlinkparams, batch.leapforward)"
           tal:condition="batch/leapforward"
           tal:omit-tag="" >
         &hellip;
@@ -128,11 +130,11 @@
         &hellip;
         </span>
         <a href=""
-           tal:attributes="href python: '%s?%s' % (url,batch.pageurl(request.form,batch.numpages));"
+           tal:attributes="href python: '%s?%s' % (url,batch.pageurl(batchlinkparams,batch.numpages));"
            tal:content="batch/numpages">3457</a>
     </span>
 
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: Plone/trunk/docs/CHANGES.txt
==============================================================================
--- Plone/trunk/docs/CHANGES.txt	(original)
+++ Plone/trunk/docs/CHANGES.txt	Mon Mar  1 20:53:01 2010
@@ -8,6 +8,11 @@
 4.0b1 - Unreleased
 ------------------
 
+- Added optional batchformkeys parameter to batch_macros.pt to restrict which
+  form fields will be included in batch navigation links (for immediate use
+  in plone.app.controlpanel's user and groups listsings).
+  [cah190]
+
 - Added markup to give styling to document ByLine in folder_summary_view.
   This fixes http://dev.plone.org/plone/ticket/6094
   [dunlapm]