Changeset 408 for trunk/services

Timestamp:

Aug 30, 2012 5:52:29 PM (12 years ago)

Author:

anonymous

Message:

Improved admin list filter query retention

File:

• trunk/services/admins.php (modified) (11 diffs)

trunk/services/admins.php

@@ -81 +81 @@
 $page->setPageNumber(getFormData('page_number'));
 
-// Search limiters retain their values between page requests.
-$app->carryQuery('search_query');
-
+// Query parameters to retain only locally.
+$locally_carried_queries = array(
+    'search_query',
+);
 
 /********************************************************************
@@ -121 +122 @@
     if ($app->validBoomerangURL('admins')) {
         // Display boomerang page.
-        $app->dieBoomerangURL('admins');
+        $app->dieBoomerangURL('admins', $locally_carried_queries);
     }
     // Display default page.
-    $app->dieURL($_SERVER['PHP_SELF']);
+    $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
     break;
 
@@ -131 +132 @@
         if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            $app->dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins', $locally_carried_queries);
         }
         // Display default page.
-        $app->dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
     }
     validateInput();
@@ -146 +147 @@
         if (getFormdata('repeat', false)) {
             // Display function again.
-            $app->dieURL($_SERVER['PHP_SELF'] . '?op=add');
+            $app->dieURL($_SERVER['PHP_SELF'] . '?op=add', $locally_carried_queries);
         } else if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            $app->dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins', $locally_carried_queries);
         }
         // Display default page.
-        $app->dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
     }
     break;
@@ -159 +160 @@
     if (getFormdata('reset', false)) {
         $app->raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
-        $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . getFormData('admin_id'));
+        $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . getFormData('admin_id'), $locally_carried_queries);
     }
     if (getFormdata('cancel', false)) {
@@ -167 +168 @@
         if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            $app->dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins', $locally_carried_queries);
         }
         // Display default page.
-        $app->dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
     }
     validateInput();
@@ -184 +185 @@
             $qid = $db->query("SELECT " . $auth->getParam('db_primary_key') . " FROM " . $auth->getParam('db_table') . " WHERE " . $auth->getParam('db_primary_key') . " > '" . $db->escapeString(getFormData('admin_id')) . "' ORDER BY " . $auth->getParam('db_primary_key') . " ASC LIMIT 1");
             if (list($next_id) = mysql_fetch_row($qid)) {
-                $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id);
+                $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id, $locally_carried_queries);
             } else {
                 $app->raiseMsg(_("Cannot edit next, the end of the list was reached"), MSG_NOTICE, __FILE__, __LINE__);
@@ -190 +191 @@
         } else if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            $app->dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins', $locally_carried_queries);
         }
         // Display default page.
-        $app->dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
     }
     break;
@@ -208 +209 @@
 
 include 'header.ihtml';
+$app->carryQuery($locally_carried_queries);
 include 'codebase/services/templates/' . $main_template;
 include 'footer.ihtml';
@@ -305 +307 @@
         $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
         $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
-        $app->dieBoomerangURL();
+        $app->dieBoomerangURL('admins', $locally_carried_queries);
     }
 
@@ -366 +368 @@
         $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
         $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
-        $app->dieBoomerangURL();
+        $app->dieBoomerangURL('admins', $locally_carried_queries);
     }