From b3adf4b142fba6108d2bdcd61ba2345ec48bf337 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Wed, 31 Oct 2007 14:38:03 -0400
Subject: Changelog cleanup + shorten the pagination parameters

---
 CHANGELOG                        | 11 ++++++-----
 cobbler/webui/CobblerWeb.py      |  4 ++--
 webui_templates/system_list.tmpl | 15 ++++++---------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 70cf3ac..ebd56fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,11 +7,12 @@ Cobbler CHANGELOG
 - Add --virt-cpus to profile editing
 - Fix bug where WUI (XMLRPC) auth wasn't supported on EL4
 - Add --virt-bridge to profile editing and NICs
-- Added serializer_shelve for added performance/persistance over YAML
-- Backup state and migrate structures upon RPM upgrade
-- Added some more unsupported distros to the rsync.exclude file
-- pre-sync and post-sync triggers, service restarts are now in /var/lib/cobbler/triggers
-- webui now uses htaccess 
+- Added serializer_shelve (as option) for added performance/persistance over YAML
+- Backup state files and migrate state structures upon RPM upgrade
+- Added some more redundant files (for unsupported distros) to the rsync.exclude file
+- added pre-sync and post-sync triggers, service restarts are now handled by /var/lib/cobbler/triggers
+- webui now uses htaccess (see manpage)
+- added pagination to the WUI to keep pages from growing overly long
 
 * Fri Sep 28 2007 - 0.6.2
 - cobbler repo auto-add to discover yum repos automatically
diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index 6340b2b..67adf91 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -350,12 +350,12 @@ class CobblerWeb(object):
         return (page, results_per_page, pages)
         
 
-    def system_list(self,page=None,results_per_page=None):
+    def system_list(self,page=None,limit=None):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
 
-        (page, results_per_page, pages) = self.__compute_pagination(page,results_per_page,"system")
+        (page, results_per_page, pages) = self.__compute_pagination(page,limit,"system")
         systems = self.remote.get_systems(page,results_per_page)
 
         if len(systems) > 0:
diff --git a/webui_templates/system_list.tmpl b/webui_templates/system_list.tmpl
index 1a6e178..4298a38 100644
--- a/webui_templates/system_list.tmpl
+++ b/webui_templates/system_list.tmpl
@@ -2,23 +2,19 @@
 
 #block body
 
-    ## navigation for pages
-
-    <!-- DEBUG: num pages is $pages<br/> -->
-    <!-- DEBUG: current page is $page<br/> -->
-    <!-- DEBUG: results per page is $results_per_page</br> -->
-
+    ## ==== BEGIN PAGE NAVIGATION ====
+    #set what="system"
     Page:&nbsp;
     #if $page != 0
        #set $previous_page = $page - 1
-       <A HREF="${base_url}/system_list?page=${previous_page}&results_per_page=${results_per_page}">&lt;</A>&nbsp;
+       <A HREF="${base_url}/${what}_list?page=${previous_page}&limit=${results_per_page}">&lt;</A>&nbsp;
     #else
        [
     #end if
 
     #for $this_page in range(0,$pages+1)
        #if $this_page != $page
-           <A HREF="${base_url}/system_list?page=${this_page}&results_per_page=${results_per_page}">${this_page}</A>&nbsp;
+           <A HREF="${base_url}/${what}_list?page=${this_page}&limit=${results_per_page}">${this_page}</A>&nbsp;
        #else
            ${this_page}
        #end if
@@ -26,13 +22,14 @@
 
     #if $page != $pages
        #set $next_page = $page + 1
-       <A HREF="${base_url}/system_list?page=${next_page}&results_per_page=${results_per_page}">&gt;</A>
+       <A HREF="${base_url}/${what}_list?page=${next_page}&limit=${results_per_page}">&gt;</A>
     #else
        ]
     #end if
 
     <br/>
     <br/>
+    ## ==== END PAGE NAVIGATION ====
 
 <table class="sortable">
 
-- 
cgit