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

Bug #3298581 - Row marking, null-checkbox of inline edit broken

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-05-07 10:55:01 +05:30
parent f3a6895372
commit 27224a88c5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/functions.js
View File

@@ -1118,7 +1118,7 @@ function changeMIMEType(db, table, reference, mime_type)
* Jquery Coding for inline editing SQL_QUERY * Jquery Coding for inline editing SQL_QUERY
*/ */
$(document).ready(function(){ $(document).ready(function(){
$(".inline_edit").click( function(){ $(".inline_edit_sql").click( function(){
var db = $(this).prev().find("input[name='db']").val(); var db = $(this).prev().find("input[name='db']").val();
var table = $(this).prev().find("input[name='table']").val(); var table = $(this).prev().find("input[name='table']").val();
var token = $(this).prev().find("input[name='token']").val(); var token = $(this).prev().find("input[name='token']").val();

6
libraries/common.lib.php
View File

@@ -663,7 +663,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
if ($exit) { if ($exit) {
/** /**
* If in an Ajax request * If in an Ajax request
* - avoid displaying a Back link * - avoid displaying a Back link
* - use PMA_ajaxResponse() to transmit the message and exit * - use PMA_ajaxResponse() to transmit the message and exit
*/ */
if($GLOBALS['is_ajax_request'] == true) { if($GLOBALS['is_ajax_request'] == true) {
@@ -1255,7 +1255,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// in the tools div, only display the Inline link when not in ajax // 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 // mode because 1) it currently does not work and 2) we would
// have two similar mechanisms on the page for the same goal // have two similar mechanisms on the page for the same goal
if ($is_select || $GLOBALS['is_ajax_request'] === false) { if ($is_select || $GLOBALS['is_ajax_request'] === false) {
// see in js/functions.js the jQuery code attached to id inline_edit // see in js/functions.js the jQuery code attached to id inline_edit
// document.write conflicts with jQuery, hence used $().append() // document.write conflicts with jQuery, hence used $().append()
@@ -1263,7 +1263,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
"//<![CDATA[\n" . "//<![CDATA[\n" .
"$('.tools form').last().after('[<a href=\"#\" title=\"" . "$('.tools form').last().after('[<a href=\"#\" title=\"" .
PMA_escapeJsString(__('Inline edit of this query')) . PMA_escapeJsString(__('Inline edit of this query')) .
"\" class=\"inline_edit\">" . "\" class=\"inline_edit_sql\">" .
PMA_escapeJsString(__('Inline')) . PMA_escapeJsString(__('Inline')) .
"</a>]');\n" . "</a>]');\n" .
"//]]>\n" . "//]]>\n" .