Fix batch numbers computation. fixes gh-25

plone · Sep 2, 2021 · 5c9320a · 5c9320a
1 parent 286565d
commit 5c9320a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/news/25.bugfix b/news/25.bugfix
@@ -0,0 +1,2 @@
+Fix batch numbers computation
+[frapell]
diff --git a/plone/formwidget/recurrence/browser/json_recurrence.py b/plone/formwidget/recurrence/browser/json_recurrence.py
@@ -177,14 +177,14 @@ def json_string(self):
         cur_batch = cur_batch - first_batch
         # correct number of occurrences in current batch
         (cur_batch_start, cur_batch_end) = batches[cur_batch]
-        if cur_batch_end > len(occurrences):
-            batches[cur_batch] = (cur_batch_start, len(occurrences))
+        if cur_batch_end > num_occurrences:
+            batches[cur_batch] = (cur_batch_start, num_occurrences)
 
         batch_data = {'start': start,
                       'end': num_occurrences,
                       'batch_size': batch_size,
                       'batches': batches,
-                      'currentBatch': cur_batch - first_batch,
+                      'currentBatch': cur_batch,
                       }
 
         result = {'occurrences': occurrences, 'batch': batch_data}