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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-09-15 14:00:58 +02:00
commit 26b6ba50a6
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
4.2.8.1 (not yet released)
- bug #4530 [security] DOM based XSS that results to a CSRF that creates a
ROOT account in certain conditions
- bug #4523 tbl_change.js: insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value
4.2.8.0 (2014-08-31)
- bug #4516 Odd export behavior

20
js/tbl_change.js
View File

@ -311,20 +311,28 @@ AJAX.registerOnload('tbl_change.js', function () {
* available).
*/
$('select[name="submit_type"]').bind('change', function (e) {
var thisElemSubmitTypeVal = $(this).val();
var $table = $('table.insertRowTable');
var auto_increment_column = $table.find('input[name^="auto_increment"]').attr('name');
if (auto_increment_column) {
var prev_value_field = $table.find('input[name="' + auto_increment_column.replace('auto_increment', 'fields_prev') + '"]');
var value_field = $table.find('input[name="' + auto_increment_column.replace('auto_increment', 'fields') + '"]');
var auto_increment_column = $table.find('input[name^="auto_increment"]');
auto_increment_column.each(function () {
var $thisElemAIField = $(this);
var thisElemName = $thisElemAIField.attr('name');
var prev_value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields_prev') + '"]');
var value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields') + '"]');
var previous_value = $(prev_value_field).val();
if (previous_value !== undefined) {
if ($(this).val() == 'insert' || $(this).val() == 'insertignore' || $(this).val() == 'showinsert') {
if (thisElemSubmitTypeVal == 'insert'
|| thisElemSubmitTypeVal == 'insertignore'
|| thisElemSubmitTypeVal == 'showinsert'
) {
$(value_field).val(0);
} else {
$(value_field).val(previous_value);
}
}
}
});
});
/**