X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/223704515eced5e8849935aaf277e4e27e9f86de..6b3d5ba966ffd150d635a618593295958233baef:/js/forms.js

diff --git a/js/forms.js b/js/forms.js
index 0e411bb..5d2bb33 100644
--- a/js/forms.js
+++ b/js/forms.js
@@ -1,24 +1,43 @@
-/* vim: set ts=4 tw=4 sw=4 noet: */
+/* vim: set ts=4 tw=0 sw=4 noet: */
 
 function updateRowsPerPage() {
-    var rowsPerPage = document.getElementById("rows");
-    var found = false;
+    var pos;
+    var url;
+    var base;
+    var href;
     var link = document.getElementsByTagName('a');
+    var found = false;
+    var rowsPerPage = document.getElementById("rows");
+
+    if (rowsPerPage.value == '') {
+        rowsPerPage.value = '20';
+    }
     for (var i = 0; i < link.length; i++) {
-        var url = link[i].href;
-        var pos = url.search('rowsperpage');
+        url = link[i].href;
+        pos = url.search('rowsperpage');
         if (pos >= 0) {
             found = true;
-            var base = url.slice(0, pos);
-            var href = base + 'rowsperpage=' + rowsPerPage.value;
+            base = url.slice(0, pos);
+            href = base + 'rowsperpage=' + rowsPerPage.value;
             link[i].href = href;
         }
     }
     if (found == false) {
-        /* current page has rows < current rows per page */
-        var href = location.href;
-        href = encodeURI('index.php?rowsperpage=' + rowsPerPage.value);
-        alert(href);
-        location.assign(href);
+        pos = location.href.search('rowsperpage');
+        if (pos >= 0) {
+            base = location.href.slice(0, pos);
+        } else {
+            base = location.href;
+        }
+        if (base.charAt(base.length - 1) == '?') {
+            href = base + 'rowsperpage=' + rowsPerPage.value;
+        } else {
+            href = base + '?rowsperpage=' + rowsPerPage.value;
+        }
+    } else {
+        pos = location.href.search('rowsperpage');
+        base = location.href.slice(0, pos);
+        href = base + 'rowsperpage=' + rowsPerPage.value;
     }
+    location.href = href;
 }