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

Patch #3276121 Inline link goes missing after table sort

Browse Source
This commit is contained in:
onebighack
2011-04-18 12:27:37 -04:00
committed by Marc Delisle
parent b47903e03f
commit 14395afa8d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/functions.js
View File

@@ -1114,7 +1114,7 @@ function changeMIMEType(db, table, reference, mime_type)
$(document).ready(function(){
var oldText,db,table,token,sql_query;
oldText=$(".inner_sql").html();
$("#inline_edit").click(function(){
$("#inline_edit").live('click',function(){
db=$("input[name='db']").val();
table=$("input[name='table']").val();
token=$("input[name='token']").val();

7
libraries/common.lib.php
View File

@@ -1133,10 +1133,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (! empty($GLOBALS['validatequery'])) {
$explain_params['validatequery'] = 1;
}
$is_select_true=false;
if (preg_match('@^SELECT[[:space:]]+@i', $sql_query)) {
$explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
$_message = __('Explain SQL');
$is_select_true = true;
} elseif (preg_match('@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i', $sql_query)) {
$explain_params['sql_query'] = substr($sql_query, 8);
$_message = __('Skip Explain SQL');
@@ -1255,12 +1256,12 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// in the tools div, only display the Inline link when not in ajax
// mode because 1) it currently does not work and 2) we would
// have two similar mechanisms on the page for the same goal
if ($GLOBALS['is_ajax_request'] === false) {
if ($is_select_true ==true || $GLOBALS['is_ajax_request'] === false) {
// see in js/functions.js the jQuery code attached to id inline_edit
// document.write conflicts with jQuery, hence used $().append()
echo "<script type=\"text/javascript\">\n" .
"//<![CDATA[\n" .
"$('.tools').append('[<a href=\"#\" title=\"" .
"$('.tools form').after('[<a href=\"#\" title=\"" .
PMA_escapeJsString(__('Inline edit of this query')) .
"\" id=\"inline_edit\">" .
PMA_escapeJsString(__('Inline')) .