Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne
2011-02-12 21:29:21 +05:30
2 changed files with 5 additions and 4 deletions

View File

@@ -37,11 +37,11 @@ function getFieldName($this_field, disp_mode) {
var this_field_index = $this_field.index();
// ltr or rtl direction does not impact how the DOM was generated
//
// 4 columns to account for the checkbox, edit, delete and appended inline edit anchors but index is zero-based so substract 3
var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text();
// 5 columns to account for the checkbox, edit, appended inline edit, copy and delete anchors but index is zero-based so substract 4
var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-4 )+') a').text();
// happens when just one row (headings contain no a)
if ("" == field_name) {
field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+')').text();
field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-4 )+')').text();
}
}

View File

@@ -1473,7 +1473,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
if (isset($edit_url)) {
$vertical_display['edit'][$row_no] .= PMA_generateEditLink($edit_url, $copy_url, $alternating_color_class . ' ' . $edit_anchor_class . $vertical_class, $edit_str, $where_clause, $where_clause_html);
$vertical_display['edit'][$row_no] .= PMA_generateEditLink($edit_url, $alternating_color_class . ' ' . $edit_anchor_class . $vertical_class, $edit_str, $where_clause, $where_clause_html);
} else {
unset($vertical_display['edit'][$row_no]);
}
@@ -2559,6 +2559,7 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) {
/**
* Generates checkbox and links at some position (left or right)
* (only called for horizontal mode)
*
* @uses PMA_generateCheckboxForMulti()
* @uses PMA_generateEditLink()