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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-06-08 20:19:28 +02:00
commit 696286b744
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
- bug Query error on submitting a column change form containing a disabled input field
- bug Incorrect menu tab generation from usergroups
- bug Missing space in index creation/edit generated query
- bug #4434 Unchecking 'Show SQL queries' results NaN
4.2.2.0 (2014-05-20)
- bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree

22
js/makegrid.js
View File

@ -1286,16 +1286,18 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
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);
// sqlOuter and tools will not be present if 'Show SQL queries' configuration is off
if (typeof sqlOuter != 'undefined' && typeof tools != 'undefined') {
// 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'));
}
else {
$('#result_query').append(sqlOuter+tools);
}
PMA_highlightSQL($('#result_query'));
}
// hide and/or update the successfully saved cells
g.hideEditCell(true, data);
@ -1861,7 +1863,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
});
})
.mouseleave(function (e) {
g.showSortHint = false;
g.showSortHint = false;
g.showRemColHint = false;
$(t).find("th.draggable").tooltip("option", {
content: g.updateHint()