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

Patch #3249406 Error in updating using inline edit

Browse Source
This commit is contained in:
onebighack
2011-04-07 13:01:57 -04:00
committed by Marc Delisle
parent 9433f4e78f
commit f6fb9b4678
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/sql.js
View File

@@ -18,6 +18,10 @@ function PMA_urldecode(str) {
return decodeURIComponent(str.replace(/\+/g, '%20')); return decodeURIComponent(str.replace(/\+/g, '%20'));
} }
function PMA_urlencode(str) {
return encodeURIComponent(str.replace(/\%20/g, '+'));
}
/** /**
* Get the field name for the current field. Required to construct the query * Get the field name for the current field. Required to construct the query
* for inline editing * for inline editing
@@ -683,7 +687,6 @@ $(document).ready(function() {
'token' : window.parent.token, 'token' : window.parent.token,
'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); $this_field.append(data.dropdown);
$this_field.data('original_data', data_value); $this_field.data('original_data', data_value);
@@ -791,6 +794,9 @@ $(document).ready(function() {
var sql_query = 'UPDATE `' + window.parent.table + '` SET '; var sql_query = 'UPDATE `' + window.parent.table + '` SET ';
var need_to_post = false; var need_to_post = false;
var new_clause='';
var prev_index=-1;
$input_siblings.each(function() { $input_siblings.each(function() {
/** @lends jQuery */ /** @lends jQuery */
@@ -849,6 +855,9 @@ $(document).ready(function() {
$.extend(relation_fields, this_field_params); $.extend(relation_fields, this_field_params);
} }
} }
if(where_clause.indexOf(field_name) > prev_index){
new_clause += '`'+window.parent.table+'`.'+'`' + field_name + "` = '"+this_field_params[field_name].replace(/'/g,"''")+"'"+' AND ';
}
if (this_field_params[field_name] != $this_field.data('original_data')) { if (this_field_params[field_name] != $this_field.data('original_data')) {
sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , ";
need_to_post = true; need_to_post = true;
@@ -856,10 +865,15 @@ $(document).ready(function() {
} }
}) })
/*
* update the where_clause, remove the last appended ' AND '
* */
//Remove the last ',' appended in the above loop //Remove the last ',' appended in the above loop
sql_query = sql_query.replace(/,\s$/, ''); sql_query = sql_query.replace(/,\s$/, '');
new_clause=new_clause.substring(0,new_clause.length-5);
new_clause=PMA_urlencode(new_clause);
sql_query += ' WHERE ' + PMA_urldecode(where_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause);
/** /**
* @var rel_fields_list String, url encoded representation of {@link relations_fields} * @var rel_fields_list String, url encoded representation of {@link relations_fields}
*/ */
@@ -897,6 +911,12 @@ $(document).ready(function() {
$.post('tbl_replace.php', post_params, function(data) { $.post('tbl_replace.php', post_params, function(data) {
if(data.success == true) { if(data.success == true) {
PMA_ajaxShowMessage(data.message); PMA_ajaxShowMessage(data.message);
if(disp_mode == 'vertical') {
$this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').attr('value',new_clause);
}
else {
$this_td.parent('tr').find('.where_clause').attr('value',new_clause);
}
// remove possible previous feedback message // remove possible previous feedback message
$('#result_query').remove(); $('#result_query').remove();
if (typeof data.result_query != 'undefined') { if (typeof data.result_query != 'undefined') {