[Checkins] SVN: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/ Coerce batch start to integer.

Charlie Clark charlie at begeistert.org
Thu Aug 13 18:01:27 EDT 2009


Log message for revision 102751:
  Coerce batch start to integer.
  Form method list_batch_items renamed in CamelCase to match Batch.

Changed:
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/new_folder.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt

-=-
Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/new_folder.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/new_folder.py	2009-08-13 21:56:27 UTC (rev 102750)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/new_folder.py	2009-08-13 22:01:27 UTC (rev 102751)
@@ -88,7 +88,7 @@
 
     @memoize
     def _getBatchStart(self):
-        return self.request.form.get('b_start', 0)
+        return int(self.request.form.get('b_start', 0))
 
     @memoize
     def _getBatchObj(self):
@@ -215,7 +215,7 @@
 
     @memoize
     def summary_type(self):
-        length = self._get_batch_bj().sequence_length
+        length = self._getBatchObj().sequence_length
         return (length == 1) and _(u'item') or _(u'items')
 
     @memoize
@@ -393,11 +393,11 @@
                              ((key, 'cmp', reverse and 'desc' or 'asc'),))
     
     @memoize
-    def list_batch_items(self):
+    def listBatchItems(self):
         """Return the widgets for the form in the interface field order"""
         batch_obj = self._getBatchObj()
         b_start = self._getBatchStart()
-        (key, reverse) = self._get_sorting()
+        key, reverse = self._get_sorting()
         fields = []
 
         for idx, item in enumerate(batch_obj):
@@ -414,7 +414,6 @@
             fields.append(field.copy())
         return fields
                 
-    @memoize
     def _get_ids(self, data):
         """Identify objects that have been selected"""
         ids = [k.split(".")[0] for k, v in data.items() 

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt	2009-08-13 21:56:27 UTC (rev 102750)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt	2009-08-13 22:01:27 UTC (rev 102751)
@@ -35,7 +35,7 @@
          tal:attributes="href column/url"
          >Column Title</a></th>
      </tr>
-   <tr tal:repeat="item view/list_batch_items" 
+   <tr tal:repeat="item view/listBatchItems" 
       tal:attributes="class python: (repeat['item'].even() and 'row-hilite') or ''">
      <td tal:content="structure item/select">Checkbox</td>
      <td><a href="" tal:attributes="href item/url"



More information about the Checkins mailing list