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

Merge branch 'nulll-pointer-zoom_search_error' into QA_4_8

Browse Source 
Fix #13439
This commit is contained in:
Maurício Meneghini Fauth 2018-03-29 15:32:25 -03:00
commit 7222e02df5
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/tbl_zoom_plot_jqplot.js
View File

@ -182,10 +182,10 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'field' : $('#tableid_1').val(),
'it' : 1
}, function (data) {
$('#tableFieldsId').find('tr:eq(3) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(3) td:eq(1)').html(data.field_collation);
$('#tableFieldsId').find('tr:eq(3) td:eq(2)').html(data.field_operators);
$('#tableFieldsId').find('tr:eq(3) td:eq(3)').html(data.field_value);
$('#tableFieldsId').find('tr:eq(2) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(2) td:eq(1)').html(data.field_collation);
$('#tableFieldsId').find('tr:eq(2) td:eq(2)').html(data.field_operators);
$('#tableFieldsId').find('tr:eq(2) td:eq(3)').html(data.field_value);
yLabel = $('#tableid_1').val();
$('#types_1').val(data.field_type);
yType = data.field_type;
@ -205,10 +205,10 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'field' : $('#tableid_2').val(),
'it' : 2
}, function (data) {
$('#tableFieldsId').find('tr:eq(6) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(6) td:eq(1)').html(data.field_collation);
$('#tableFieldsId').find('tr:eq(6) td:eq(2)').html(data.field_operators);
$('#tableFieldsId').find('tr:eq(6) td:eq(3)').html(data.field_value);
$('#tableFieldsId').find('tr:eq(4) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(4) td:eq(1)').html(data.field_collation);
$('#tableFieldsId').find('tr:eq(4) td:eq(2)').html(data.field_operators);
$('#tableFieldsId').find('tr:eq(4) td:eq(3)').html(data.field_value);
$('#types_2').val(data.field_type);
$('#collations_2').val(data.field_collations);
addDateTimePicker();
@ -226,10 +226,10 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'field' : $('#tableid_3').val(),
'it' : 3
}, function (data) {
$('#tableFieldsId').find('tr:eq(8) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(8) td:eq(1)').html(data.field_collation);
$('#tableFieldsId').find('tr:eq(8) td:eq(2)').html(data.field_operators);
$('#tableFieldsId').find('tr:eq(8) td:eq(3)').html(data.field_value);
$('#tableFieldsId').find('tr:eq(5) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(5) td:eq(1)').html(data.field_collation);
$('#tableFieldsId').find('tr:eq(5) td:eq(2)').html(data.field_operators);
$('#tableFieldsId').find('tr:eq(5) td:eq(3)').html(data.field_value);
$('#types_3').val(data.field_type);
$('#collations_3').val(data.field_collations);
addDateTimePicker();

2
templates/table/search/rows_zoom.twig
View File

@ -55,6 +55,8 @@
{{ func[i] is defined ? func[i]|raw }}
</td>
{# Inputbox for search criteria value #}
<td>
</td>
<td>
{{ value[i] is defined ? value[i]|raw }}
{# Displays hidden fields #}