Changeset 408


Ignore:
Timestamp:
Aug 30, 2012 5:52:29 PM (12 years ago)
Author:
anonymous
Message:

Improved admin list filter query retention

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/bin/module_maker/skel/admin.php

    r405 r408  
    6767$page->setPageNumber(getFormData('page_number'));
    6868
    69 // Search limiters retain their values between page requests.
    70 $app->carryQuery('search_query');
    71 $app->carryQuery('filter___///__');
     69// Query parameters to retain always.
     70$app->carryQuery(array(
     71    'filter___///__',
     72));
     73
     74// Query parameters to retain only locally.
     75$locally_carried_queries = array(
     76    'search_query',
     77);
    7278%ADMIN_UPLOAD_CONFIG%
    7379/********************************************************************
    … …  
    107113    if ($app->validBoomerangURL('%NAME_PLURAL%')) {
    108114        // Display boomerang page.
    109         $app->dieBoomerangURL('%NAME_PLURAL%');
     115        $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    110116    }
    111117    // Display default page.
    112     $app->dieURL($_SERVER['PHP_SELF']);
     118    $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    113119    break;
    114120
    … …  
    117123        if ($app->validBoomerangURL('%NAME_PLURAL%')) {
    118124            // Display boomerang page.
    119             $app->dieBoomerangURL('%NAME_PLURAL%');
     125            $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    120126        }
    121127        // Display default page.
    122         $app->dieURL($_SERVER['PHP_SELF']);
     128        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    123129    }
    124130    validateInput();
    … …  
    132138        if (getFormdata('repeat', false)) {
    133139            // Display function again.
    134             $app->dieURL($_SERVER['PHP_SELF'] . '?op=add');
     140            $app->dieURL($_SERVER['PHP_SELF'] . '?op=add', $locally_carried_queries);
    135141        } else if ($app->validBoomerangURL('%NAME_PLURAL%')) {
    136142            // Display boomerang page.
    137             $app->dieBoomerangURL('%NAME_PLURAL%');
     143            $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    138144        }
    139145        // Display default page.
    140         $app->dieURL($_SERVER['PHP_SELF']);
     146        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    141147    }
    142148    break;
    … …  
    145151    if (getFormdata('reset', false)) {
    146152        $app->raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
    147         $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . getFormData('%PRIMARY_KEY%'));
     153        $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . getFormData('%PRIMARY_KEY%'), $locally_carried_queries);
    148154    }
    149155    if (getFormdata('cancel', false)) {
    … …  
    153159        if ($app->validBoomerangURL('%NAME_PLURAL%')) {
    154160            // Display boomerang page.
    155             $app->dieBoomerangURL('%NAME_PLURAL%');
     161            $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    156162        }
    157163        // Display default page.
    158         $app->dieURL($_SERVER['PHP_SELF']);
     164        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    159165    }
    160166    validateInput();
    … …  
    170176            $qid = $db->query("SELECT %PRIMARY_KEY% FROM %DB_TBL% WHERE %PRIMARY_KEY% > '" . $db->escapeString(getFormData('%PRIMARY_KEY%')) . "' ORDER BY %PRIMARY_KEY% ASC LIMIT 1");
    171177            if (list($next_id) = mysql_fetch_row($qid)) {
    172                 $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $next_id);
     178                $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $next_id, $locally_carried_queries);
    173179            } else {
    174180                $app->raiseMsg(_("Cannot edit next, the end of the list was reached"), MSG_NOTICE, __FILE__, __LINE__);
    … …  
    176182        } else if ($app->validBoomerangURL('%NAME_PLURAL%')) {
    177183            // Display boomerang page.
    178             $app->dieBoomerangURL('%NAME_PLURAL%');
     184            $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    179185        }
    180186        // Display default page.
    181         $app->dieURL($_SERVER['PHP_SELF']);
     187        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    182188    }
    183189    break;
    … …  
    185191case _("Save rank") :
    186192    updateRank(getFormData('rank'));
    187     $app->dieURL($_SERVER['PHP_SELF']);
     193    $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    188194    break;
    189195
    … …  
    199205
    200206include 'header.ihtml';
     207$app->carryQuery($locally_carried_queries);
    201208include $main_template;
    202209include 'footer.ihtml';
    … …  
    244251        $app->logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
    245252        $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
    246         $app->dieBoomerangURL();
     253        $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    247254    }
    248255
    … …  
    289296        $app->logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
    290297        $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
    291         $app->dieBoomerangURL();
     298        $app->dieBoomerangURL('%NAME_PLURAL%', $locally_carried_queries);
    292299    }
    293300

  • trunk/services/admins.php

    r405 r408  
    8181$page->setPageNumber(getFormData('page_number'));
    8282
    83 // Search limiters retain their values between page requests.
    84 $app->carryQuery('search_query');
    85 
     83// Query parameters to retain only locally.
     84$locally_carried_queries = array(
     85    'search_query',
     86);
    8687
    8788/********************************************************************
    … …  
    121122    if ($app->validBoomerangURL('admins')) {
    122123        // Display boomerang page.
    123         $app->dieBoomerangURL('admins');
     124        $app->dieBoomerangURL('admins', $locally_carried_queries);
    124125    }
    125126    // Display default page.
    126     $app->dieURL($_SERVER['PHP_SELF']);
     127    $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    127128    break;
    128129
    … …  
    131132        if ($app->validBoomerangURL('admins')) {
    132133            // Display boomerang page.
    133             $app->dieBoomerangURL('admins');
     134            $app->dieBoomerangURL('admins', $locally_carried_queries);
    134135        }
    135136        // Display default page.
    136         $app->dieURL($_SERVER['PHP_SELF']);
     137        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    137138    }
    138139    validateInput();
    … …  
    146147        if (getFormdata('repeat', false)) {
    147148            // Display function again.
    148             $app->dieURL($_SERVER['PHP_SELF'] . '?op=add');
     149            $app->dieURL($_SERVER['PHP_SELF'] . '?op=add', $locally_carried_queries);
    149150        } else if ($app->validBoomerangURL('admins')) {
    150151            // Display boomerang page.
    151             $app->dieBoomerangURL('admins');
     152            $app->dieBoomerangURL('admins', $locally_carried_queries);
    152153        }
    153154        // Display default page.
    154         $app->dieURL($_SERVER['PHP_SELF']);
     155        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    155156    }
    156157    break;
    … …  
    159160    if (getFormdata('reset', false)) {
    160161        $app->raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
    161         $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . getFormData('admin_id'));
     162        $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . getFormData('admin_id'), $locally_carried_queries);
    162163    }
    163164    if (getFormdata('cancel', false)) {
    … …  
    167168        if ($app->validBoomerangURL('admins')) {
    168169            // Display boomerang page.
    169             $app->dieBoomerangURL('admins');
     170            $app->dieBoomerangURL('admins', $locally_carried_queries);
    170171        }
    171172        // Display default page.
    172         $app->dieURL($_SERVER['PHP_SELF']);
     173        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    173174    }
    174175    validateInput();
    … …  
    184185            $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");
    185186            if (list($next_id) = mysql_fetch_row($qid)) {
    186                 $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id);
     187                $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id, $locally_carried_queries);
    187188            } else {
    188189                $app->raiseMsg(_("Cannot edit next, the end of the list was reached"), MSG_NOTICE, __FILE__, __LINE__);
    … …  
    190191        } else if ($app->validBoomerangURL('admins')) {
    191192            // Display boomerang page.
    192             $app->dieBoomerangURL('admins');
     193            $app->dieBoomerangURL('admins', $locally_carried_queries);
    193194        }
    194195        // Display default page.
    195         $app->dieURL($_SERVER['PHP_SELF']);
     196        $app->dieURL($_SERVER['PHP_SELF'], $locally_carried_queries);
    196197    }
    197198    break;
    … …  
    208209
    209210include 'header.ihtml';
     211$app->carryQuery($locally_carried_queries);
    210212include 'codebase/services/templates/' . $main_template;
    211213include 'footer.ihtml';
    … …  
    305307        $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
    306308        $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
    307         $app->dieBoomerangURL();
     309        $app->dieBoomerangURL('admins', $locally_carried_queries);
    308310    }
    309311
    … …  
    366368        $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
    367369        $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
    368         $app->dieBoomerangURL();
     370        $app->dieBoomerangURL('admins', $locally_carried_queries);
    369371    }
    370372
Note: See TracChangeset for help on using the changeset viewer.