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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-12-09 21:07:56 +01:00
commit 6f1dbd46ad
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog
- issue #11706 Database export template not saving compression option
- issue #11721 Fix single quote export for servers in ANSI_QUOTES mode
- issue #11714 Avoid duplicite fetching of table information
- issue #11724 Temporary fix for live data edit of big sets is not working
4.5.2.0 (2015-11-23)
- issue #11589 Incorrect parameter in mysqli_fetch_fields()

6
js/makegrid.js
View File

@ -795,7 +795,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
}
// if the select/editor is changed un-check the 'checkbox_null_<field_name>_<row_index>'.
if ($td.is('.enum, .set')) {
if ($td.is('.enum, .set:not(.truncated)')) {
$editArea.on('change', 'select', function (e) {
$checkbox.prop('checked', false);
});
@ -925,7 +925,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$(g.cEdit).find('.edit_box').val($(this).val());
});
}
else if ($td.is('.set')) {
else if ($td.is('.set:not(.truncated)')) {
//handle set fields
$editArea.addClass('edit_area_loading');
@ -1412,7 +1412,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
} else {
if ($this_field.is('.bit')) {
this_field_params[field_name] = $(g.cEdit).find('.edit_box').val();
} else if ($this_field.is('.set')) {
} else if ($this_field.is('.set:not(.truncated)')) {
$test_element = $(g.cEdit).find('select');
this_field_params[field_name] = $test_element.map(function () {
return $(this).val();