Fix pagination of notifications

Pagination of notifications are corrupted by this change:
I112725c0e2ef6ceceb2d7be31ed36defa9d77d50
And this patch also fixes page count.

Change-Id: I56581d62480f05bd9c1a91b3d37911e720a82f40

Author: Shinya Kawabata

monitoring/notifications/views.py

@@ -20,6 +20,7 @@
 from horizon import exceptions
 from horizon import forms
 from horizon import tables
+from horizon.utils import functions as utils
 
 from monitoring.notifications import constants
 from monitoring.notifications import forms as notification_forms
@@ -28,7 +29,6 @@
 
 from openstack_dashboard import policy
 
-LIMIT = 10
 PREV_PAGE_LIMIT = 100
 
 
@@ -44,9 +44,10 @@ def get_data(self):
         results = []
         if page_offset is None:
             page_offset = 0
+        limit = utils.get_page_size(self.request)
         try:
-            results = api.monitor.notification_list(self.request, page_offset, LIMIT)
-            paginator = Paginator(results, LIMIT)
+            results = api.monitor.notification_list(self.request, page_offset, limit)
+            paginator = Paginator(results, limit)
             results = paginator.page(1)
         except EmptyPage:
             results = paginator.page(paginator.num_pages)
@@ -70,12 +71,16 @@ def get_context_data(self, **kwargs):
         if page_offset is None:
             page_offset = 0
             prev_page_stack = []
+        else:
+            page_offset = int(page_offset)
+
+        limit = utils.get_page_size(self.request)
         try:
             # To judge whether there is next page, get LIMIT + 1
             results = api.monitor.notification_list(self.request, page_offset,
-                                                    LIMIT + 1)
+                                                    limit + 1)
             num_results = len(results)
-            paginator = Paginator(results, LIMIT)
+            paginator = Paginator(results, limit)
             contacts = paginator.page(1)
         except EmptyPage:
             contacts = paginator.page(paginator.num_pages)
@@ -85,10 +90,10 @@ def get_context_data(self, **kwargs):
 
         context["contacts"] = contacts
 
-        if num_results < LIMIT + 1:
+        if num_results < limit + 1:
             context["page_offset"] = None
         else:
-            context["page_offset"] = contacts.object_list[-1]["id"]
+            context["page_offset"] = page_offset + limit
 
         if page_offset in prev_page_stack:
             index = prev_page_stack.index(page_offset)
@@ -100,7 +105,7 @@ def get_context_data(self, **kwargs):
 
         if len(prev_page_stack) > PREV_PAGE_LIMIT:
             del prev_page_stack[0]
-        prev_page_stack.append(str(page_offset))
+        prev_page_stack.append(page_offset)
         self.request.session['prev_page_stack'] = prev_page_stack
 
         return context