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

bug #3418849 [interface] Inline edit shows dropdowns even after closing

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-10-05 08:55:19 +05:30
parent f7a31e5f4c
commit ad5c7f5d0a
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
3.4.7.0 (not yet released) 3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
- bug #3418849 [interface] Inline edit shows dropdowns even after closing
3.4.6.0 (not yet released) 3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases - patch #3404173 InnoDB comment display with tooltips/aliases

25
js/sql.js
View File

@@ -710,14 +710,13 @@ $(document).ready(function() {
'sql_query' : sql_query, 'sql_query' : sql_query,
'inline_edit' : true 'inline_edit' : true
}, function(data) { }, function(data) {
if(data.success == true) { if(data.success == true && $edit_td.hasClass('inline_edit_active')) {
$this_field.append('<textarea>'+data.value+'</textarea>'); $this_field.append('<textarea>'+data.value+'</textarea>');
$this_field.data('original_data', data_value); } else {
}
else {
PMA_ajaxShowMessage(data.error); PMA_ajaxShowMessage(data.error);
} }
}) // end $.post() }) // end $.post()
$this_field.data('original_data', data_value);
} }
else if($this_field.is('.relation')) { else if($this_field.is('.relation')) {
/** @lends jQuery */ /** @lends jQuery */
@@ -738,9 +737,11 @@ $(document).ready(function() {
} }
$.post('sql.php', post_params, function(data) { $.post('sql.php', post_params, function(data) {
$this_field.append(data.dropdown); if ($edit_td.hasClass('inline_edit_active')) {
$this_field.data('original_data', data_value); $this_field.append(data.dropdown);
}
}) // end $.post() }) // end $.post()
$this_field.data('original_data', data_value);
} }
else if($this_field.is('.enum')) { else if($this_field.is('.enum')) {
/** @lends jQuery */ /** @lends jQuery */
@@ -759,9 +760,11 @@ $(document).ready(function() {
'curr_value' : curr_value 'curr_value' : curr_value
} }
$.post('sql.php', post_params, function(data) { $.post('sql.php', post_params, function(data) {
$this_field.append(data.dropdown); if ($edit_td.hasClass('inline_edit_active')) {
$this_field.data('original_data', data_value); $this_field.append(data.dropdown);
}
}) // end $.post() }) // end $.post()
$this_field.data('original_data', data_value);
} }
else if($this_field.is('.set')) { else if($this_field.is('.set')) {
/** @lends jQuery */ /** @lends jQuery */
@@ -781,9 +784,11 @@ $(document).ready(function() {
} }
$.post('sql.php', post_params, function(data) { $.post('sql.php', post_params, function(data) {
$this_field.append(data.select); if ($edit_td.hasClass('inline_edit_active')) {
$this_field.data('original_data', data_value); $this_field.append(data.select);
}
}) // end $.post() }) // end $.post()
$this_field.data('original_data', data_value);
} }
else if($this_field.is('.null')) { else if($this_field.is('.null')) {
//handle null fields //handle null fields