[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py Removed debugging log.
Charlie Clark
cvs-admin at zope.org
Sun Apr 8 16:08:41 UTC 2012
Log message for revision 125111:
Removed debugging log.
Refactored BatchViewBase.page_range() to be more readable and slightly more efficient.
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2012-04-08 16:06:10 UTC (rev 125110)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2012-04-08 16:08:37 UTC (rev 125111)
@@ -12,8 +12,6 @@
##############################################################################
"""Browser views for folders.
"""
-import logging
-LOG = logging.getLogger("Folder contents views")
import urllib
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
@@ -149,7 +147,7 @@
def navigation_previous(self):
batch_obj = self._getBatchObj().previous
if batch_obj is None:
- return None
+ return
length = len(batch_obj)
url = self._getNavigationURL(batch_obj.first)
@@ -163,7 +161,7 @@
def navigation_next(self):
batch_obj = self._getBatchObj().next
if batch_obj is None:
- return None
+ return
length = len(batch_obj)
url = self._getNavigationURL(batch_obj.first)
@@ -175,23 +173,17 @@
def page_range(self):
"""Create a range of up to ten pages around the current page"""
- pages = [(idx + 1, b_start) for idx, b_start in enumerate(
- range(0,
- self._getBatchObj().sequence_length,
- self._BATCH_SIZE)
- )
- ]
+ b_size = self._BATCH_SIZE
range_start = max(self.page_number() - 5, 0)
- range_stop = min(max(self.page_number() + 5, 10), len(pages))
- _page_range = []
- for page, b_start in pages[range_start:range_stop]:
- _page_range.append(
- {'number':page,
- 'url':self._getNavigationURL(b_start)
- }
- )
- return _page_range
+ range_stop = min(max(self.page_number() + 5, 10), self.page_count())
+ pages = []
+ for p in range(range_start, range_stop):
+ b_start = p*b_size
+ pages.append({'number':p + 1,
+ 'url':self._getNavigationURL(b_start)})
+ return pages
+
@memoize
def page_count(self):
"""Count total number of pages in the batch"""
More information about the checkins
mailing list