Merge: better layout - fix max page

1 files changed, 8 insertions, 3 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index bb68f6044..8b4d212a7 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -883,6 +883,7 @@ def reset_wizards(request):
             module.views.reset_wizards(request)
     return redirect(reverse('start'))
 
+
 ITEM_PER_PAGE = 20
 
 
@@ -896,15 +897,19 @@ def merge_action(model, form, key):
             model.merge_candidate.through, form=form,
             formset=forms.MergeFormSet, extra=0)
         q = model.merge_candidate.through.objects
+        count = q.count()
+        max_page = count // ITEM_PER_PAGE
+        if count % ITEM_PER_PAGE != 0:
+            max_page += 1
         context = {'current_url': current_url,
                    'current_page': page,
-                   'max_page': q.count() / ITEM_PER_PAGE}
-        if page < context["max_page"]:
+                   'max_page': max_page}
+        if page < max_page:
             context['next_page'] = page + 1
         if page > 1:
             context['previous_page'] = page - 1
 
-        item_nb = page * ITEM_PER_PAGE
+        item_nb = (page - 1) * ITEM_PER_PAGE
         item_nb_1 = item_nb + ITEM_PER_PAGE
         from_key = 'from_' + key
         to_key = 'to_' + key