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

Merge pull request #1020 from krtin/Bug_FIX#4301

Browse Source 
Bugfix4301
This commit is contained in:
Marc Delisle 2014-03-08 17:29:58 -05:00
commit e8be0639c0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/makegrid.js
View File

@ -1315,10 +1315,20 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
});
});
// update the display of executed SQL query command
$('#result_query').remove();
if (typeof data.sql_query != 'undefined') {
// display feedback
$('#sqlqueryresults').prepend(data.sql_query);
//extract query box
var $result_query = $($.parseHTML(data.sql_query));
var sqlOuter = $result_query.find('.sqlOuter').wrap('<p>').parent().html();
var tools = $result_query.find('.tools').wrap('<p>').parent().html();
// If two query box exists update query in second else add a second box
if($('#result_query').find('div.sqlOuter').length>1) {
$('#result_query').children(":nth-child(4)").remove();
$('#result_query').children(":nth-child(4)").remove();
$('#result_query').append(sqlOuter+tools);
}
else {
$('#result_query').append(sqlOuter+tools);
}
PMA_highlightSQL($('#result_query'));
}
// hide and/or update the successfully saved cells