Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeven Bansod <devenbansod.bits@gmail.com>2015-12-21 11:23:03 +0300
committerDeven Bansod <devenbansod.bits@gmail.com>2015-12-21 11:23:03 +0300
commit0b64ff7f72121b226a47acac5df303ad12e2ae49 (patch)
treed26a816a094b19874cc0d4424bab4356d877ca30 /js/makegrid.js
parent42a9a81cc05990c087e518c0f07e823dfb100634 (diff)
Fix #11724 : live data edit of big sets is not working
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
Diffstat (limited to 'js/makegrid.js')
-rw-r--r--js/makegrid.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/js/makegrid.js b/js/makegrid.js
index 6e583655c0..f41ef3b9e1 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -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:not(.truncated)')) {
+ if ($td.is('.enum, .set')) {
$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:not(.truncated)')) {
+ else if ($td.is('.set')) {
//handle set fields
$editArea.addClass('edit_area_loading');
@@ -943,6 +943,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
'curr_value' : curr_value
};
+ // if the data is truncated, get the full data
+ if ($td.is('.truncated')) {
+ post_params.get_full_values = true;
+ post_params.where_clause = PMA_urldecode(where_clause);
+ }
+
g.lastXHR = $.post('sql.php', post_params, function (data) {
g.lastXHR = null;
$editArea.removeClass('edit_area_loading');
@@ -1411,7 +1417,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:not(.truncated)')) {
+ } else if ($this_field.is('.set')) {
$test_element = $(g.cEdit).find('select');
this_field_params[field_name] = $test_element.map(function () {
return $(this).val();