nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Bug #3151925 Page selector dropdown broken with ORDER BY query

Browse Source 
- PMA_pageselector() had an unused parameter
This commit is contained in:
Marc Delisle
2011-01-08 15:14:00 -05:00
parent 45eb47fe14
commit 6094e6c644
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browse_foreigners.php
View File

@@ -59,12 +59,6 @@ if (is_array($foreignData['disp_row'])) {
if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) {
$gotopage = PMA_pageselector(
'browse_foreigners.php?field=' . urlencode($field) .
'&' . PMA_generate_common_url($db, $table)
. $rownumber_param .
'&fieldkey=' . (isset($fieldkey) ? urlencode($fieldkey) : '') .
'&foreign_filter=' . (isset($foreign_filter) ? urlencode($foreign_filter) : '') .
'&',
$session_max_rows,
$pageNow,
$nbTotalPage,

5
js/sql.js
View File

@@ -295,11 +295,12 @@ $(document).ready(function() {
event.preventDefault();
PMA_ajaxShowMessage();
var $the_form = $(this).parent("form");
$.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) {
$.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) {
$("#sqlqueryresults").html(data);
$("#sqlqueryresults").trigger('appendAnchor');
}) // end $.get()
}) // end $.post()
})// end Paginate results with Page Selector
/**

5
libraries/common.lib.php
View File

@@ -2173,9 +2173,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
/**
* Generate a pagination selector for browsing resultsets
*
* @todo $url is not javascript escaped!?
* @uses range()
* @param string URL for the JavaScript
* @param string Number of rows in the pagination set
* @param string current page number
* @param string number of total pages
@@ -2195,7 +2193,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
*
* @access public
*/
function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
$showAll = 200, $sliceStart = 5, $sliceEnd = 5, $percent = 20,
$range = 10, $prompt = '')
{
@@ -2320,7 +2318,6 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
echo "\n", '<form action="./', basename($script), '" method="post" target="', $frame, '">', "\n";
echo PMA_generate_common_hidden_inputs($_url_params);
echo PMA_pageselector(
$script . PMA_generate_common_url($_url_params) . '&amp;',
$max_count,
floor(($pos + 1) / $max_count) + 1,
ceil($count / $max_count));

8
libraries/display_tbl.lib.php
View File

@@ -370,8 +370,6 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
&nbsp;&nbsp;&nbsp;
</td>
<td>
<?php //<form> for keep the form alignment of button < and << ?>
<form action="none">
<?php
$_url_params = array(
'db' => $db,
@@ -379,9 +377,11 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
'sql_query' => $sql_query,
'goto' => $goto,
);
//<form> to keep the form alignment of button < and <<
// and also to know what to execute when the selector changes
echo '<form action="sql.php' . PMA_generate_common_url($_url_params). '" method="post">';
echo PMA_pageselector(
'sql.php' . PMA_generate_common_url($_url_params) . PMA_get_arg_separator('js'),
$_SESSION['tmp_user_values']['max_rows'],
$_SESSION['tmp_user_values']['max_rows'],
$pageNow,
$nbTotalPage,
200,