From 64fca23f2920694364c83a2c203b768598b0419b Mon Sep 17 00:00:00 2001
From: Sylvain Viollon <thefunny@gmail.com>
Date: Tue, 21 Feb 2012 12:37:20 +0100
Subject: [PATCH] Rename option to no_default, only available for alphabetical
 batch.

---
 src/zeam/utils/batch/alphabetical/batch.py | 18 ++++++++++--------
 src/zeam/utils/batch/date/batch.py         |  5 ++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/zeam/utils/batch/alphabetical/batch.py b/src/zeam/utils/batch/alphabetical/batch.py
index a9e3eb2..07a6f90 100644
--- a/src/zeam/utils/batch/alphabetical/batch.py
+++ b/src/zeam/utils/batch/alphabetical/batch.py
@@ -12,7 +12,7 @@ class AlphabeticalBatch(ActiveBatch):
     def __init__(
         self, collection,
         start=None, count=None, name='', request=None, factory=None,
-        letters=string.uppercase, default_all=False):
+        letters=string.uppercase, no_default=False):
         assert len(letters), 'need a list of letters to iterate through'
         if request is not None:
             key = 'bstart'
@@ -20,7 +20,7 @@ def __init__(
                 key += '_' + name
             if key in request.form:
                 start = request.form[key]
-        if start is None and not default_all:
+        if start is None and not no_default:
             start = letters[0]
         super(AlphabeticalBatch, self).__init__(
             collection,
@@ -45,9 +45,10 @@ def last(self):
     @property
     def previous(self):
         try:
-            index = self.letters.index(self.start)
-            if index:
-                return self.letters[index - 1]
+            if self.start:
+                index = self.letters.index(self.start)
+                if index:
+                    return self.letters[index - 1]
         except ValueError:
             pass
         return None
@@ -55,9 +56,10 @@ def previous(self):
     @property
     def next(self):
         try:
-            index = self.letters.index(self.start)
-            if index < len(self.letters) - 1:
-                return self.letters[index + 1]
+            if self.start:
+                index = self.letters.index(self.start)
+                if index < len(self.letters) - 1:
+                    return self.letters[index + 1]
         except ValueError:
             pass
         return None
diff --git a/src/zeam/utils/batch/date/batch.py b/src/zeam/utils/batch/date/batch.py
index 778af02..f04d3d1 100644
--- a/src/zeam/utils/batch/date/batch.py
+++ b/src/zeam/utils/batch/date/batch.py
@@ -15,8 +15,7 @@ class DateBatch(ActiveBatch):
 
     def __init__(
         self, collection,
-        start=None, count=BATCH_MONTH, name='', request=None, factory=None,
-        default_all=False):
+        start=None, count=BATCH_MONTH, name='', request=None, factory=None):
         if request is not None:
             key = 'bstart'
             if name:
@@ -26,7 +25,7 @@ def __init__(
                     start = datetime.strptime(request.form[key], '%Y-%m')
                 except (ValueError, TypeError):
                     pass
-        if start is None and not default_all:
+        if start is None:
             start = datetime.now()
         super(DateBatch, self).__init__(
             collection,