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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Rouslan Placella 2011-06-20 23:16:27 +01:00
commit d9304efed4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/sql.js
View File

@ -97,7 +97,7 @@ function appendInlineAnchor() {
$cloned_tr.insertAfter($this_tr);
});
$('#rowsDeleteForm').find('tbody').find('th').each(function() {
$('#resultsForm').find('tbody').find('th').each(function() {
var $this_th = $(this);
if ($this_th.attr('rowspan') == 4) {
$this_th.attr('rowspan', '5');
@ -149,7 +149,7 @@ function appendInlineAnchor() {
$this_td.after($cloned_anchor);
});
$('#rowsDeleteForm').find('thead, tbody').find('th').each(function() {
$('#resultsForm').find('thead, tbody').find('th').each(function() {
var $this_th = $(this);
if ($this_th.attr('colspan') == 4) {
$this_th.attr('colspan', '5');
@ -981,7 +981,7 @@ $(document).ready(function() {
}
}
})
rowsDeleteForm
/*
* update the where_clause, remove the last appended ' AND '
* */

8
libraries/display_tbl.lib.php
View File

@ -2287,11 +2287,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
$checkall_url = 'sql.php' . PMA_generate_common_url($_url_params);
if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical') {
$checkall_params['onclick'] = 'if (setCheckboxes(\'rowsDeleteForm\', true)) return false;';
$uncheckall_params['onclick'] = 'if (setCheckboxes(\'rowsDeleteForm\', false)) return false;';
$checkall_params['onclick'] = 'if (setCheckboxes(\'resultsForm\', true)) return false;';
$uncheckall_params['onclick'] = 'if (setCheckboxes(\'resultsForm\', false)) return false;';
} else {
$checkall_params['onclick'] = 'if (markAllRows(\'rowsDeleteForm\')) return false;';
$uncheckall_params['onclick'] = 'if (unMarkAllRows(\'rowsDeleteForm\')) return false;';
$checkall_params['onclick'] = 'if (markAllRows(\'resultsForm\')) return false;';
$uncheckall_params['onclick'] = 'if (unMarkAllRows(\'resultsForm\')) return false;';
}
$checkall_link = PMA_linkOrButton($checkall_url, __('Check All'), $checkall_params, false);
$uncheckall_link = PMA_linkOrButton($uncheckall_url, __('Uncheck All'), $uncheckall_params, false);