Ongoing work on WUI pagination

2 files changed, 31 insertions, 8 deletions

diff --git a/cobbler/remote.py b/cobbler/remote.py
index a292dee..a871e22 100644
--- a/cobbler/remote.py
+++ b/cobbler/remote.py
@@ -77,7 +77,7 @@ class CobblerXMLRPCInterface:
         data = self.__get_all(collection_name)
         return len(data)
 
-    def __get_all(self,collection_name,page,results_per_page):
+    def __get_all(self,collection_name,page=None,results_per_page=None):
         """
         Helper method to return all data to the WebUI or another caller
         without going through the process of loading all the data into
diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index 075bc60..6340b2b 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -326,21 +326,44 @@ class CobblerWeb(object):
     # if the system list is huge, this will probably need to use an
     # iterator so the list doesn't get copied around
 
-    def system_list(self,page=0,results_per_page=100):
+    def __compute_pagination(self,page,results_per_page,collection_type):
+
+        default_page = 0
+        default_results_per_page = 50
+        total_size = self.remote.get_size(collection_type)
+
+        try:
+            page = int(page)
+        except:
+            page = default_page
+        try:
+            results_per_page = int(results_per_page)
+        except:
+            results_per_page = default_results_per_page 
+
+        if page < 0:
+           page = default_page
+        if results_per_page <= 0:
+           results_per_page = default_results_per_page
+
+        pages = total_size / results_per_page
+        return (page, results_per_page, pages)
+        
+
+    def system_list(self,page=None,results_per_page=None):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
 
-        systems_size = self.remote.get_size("systems")
-        pages = len(systems) / results_per_page 
+        (page, results_per_page, pages) = self.__compute_pagination(page,results_per_page,"system")
         systems = self.remote.get_systems(page,results_per_page)
-         
 
         if len(systems) > 0:
             return self.__render( 'system_list.tmpl', {
-                'systems'  : systems,
-                'pages'    : pages,
-                'page'     : page
+                'systems'          : systems,
+                'pages'            : pages,
+                'page'             : page,
+                'results_per_page' : results_per_page
             } )
         else:
             return self.__render('empty.tmpl',{})