The branch, master has been updated via 30c73aef03c50cd74c13b129d6d164621f6278f6 (commit) from 582fe81aa3687a012b35cc7a7716bcdcee269019 (commit)

- Log ----------------------------------------------------------------- commit 30c73aef03c50cd74c13b129d6d164621f6278f6 Author: Marc Delisle marc@infomarc.info Date: Sat Sep 4 08:22:32 2010 -0400

bug #3057479 wrong number of rows to insert

-----------------------------------------------------------------------

Summary of changes: js/tbl_change.js | 10 +++++----- tbl_change.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/tbl_change.js b/js/tbl_change.js index a092171..17a4ba0 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -358,9 +358,9 @@ $(document).ready(function() {

//Insert/Clone the ignore checkboxes if(curr_rows == 1 ) { - $('<input id="insert_ignore_check_1" type="checkbox" name="insert_ignore_check_1" checked="checked" />') + $('<input id="insert_ignore_1" type="checkbox" name="insert_ignore_1" checked="checked" />') .insertBefore(".insertRowTable:last") - .after('<label for="insert_ignore_check_1">' + PMA_messages['strIgnore'] + '</label>'); + .after('<label for="insert_ignore_1">' + PMA_messages['strIgnore'] + '</label>'); } else {

@@ -379,7 +379,7 @@ $(document).ready(function() { $(last_checkbox) .clone() .attr({'id':new_name, 'name': new_name}) - .add('label[for^=insert_ignore_check]:last') + .add('label[for^=insert_ignore]:last') .clone() .attr('for', new_name) .before('<br />') @@ -390,7 +390,7 @@ $(document).ready(function() { } else if( curr_rows > target_rows) { while(curr_rows > target_rows) { - $("input[id^=insert_ignore_check]:last") + $("input[id^=insert_ignore]:last") .nextUntil("fieldset") .andSelf() .remove(); @@ -398,4 +398,4 @@ $(document).ready(function() { } } }) -}, 'top.frame_content'); //end $(document).ready() \ No newline at end of file +}, 'top.frame_content'); //end $(document).ready() diff --git a/tbl_change.php b/tbl_change.php index eb38d6c..2e5d78b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -292,8 +292,8 @@ foreach ($rows as $row_id => $vrow) {

$vresult = (isset($result) && is_array($result) && isset($result[$row_id]) ? $result[$row_id] : $result); if ($insert_mode && $row_id > 0) { - echo '<input type="checkbox" checked="checked" name="insert_ignore_' . $row_id . '" id="insert_ignore_check_' . $row_id . '" />'; - echo '<label for="insert_ignore_check_' . $row_id . '">' . __('Ignore') . '</label><br />' . "\n"; + echo '<input type="checkbox" checked="checked" name="insert_ignore_' . $row_id . '" id="insert_ignore_' . $row_id . '" />'; + echo '<label for="insert_ignore_' . $row_id . '">' . __('Ignore') . '</label><br />' . "\n"; } ?> <table class="insertRowTable">

hooks/post-receive