- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1416-g4beca2f
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via 4beca2fe920abbe8a0f30a23d23b84d3d6d0c0c8 (commit) from 4dddaab5fe5dc0e703db907b5ee40d0e522dfd3f (commit) - Log ----------------------------------------------------------------- commit 4beca2fe920abbe8a0f30a23d23b84d3d6d0c0c8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 17:37:33 2011 -0500 Use the clip effect instead of the drop effect ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c078085..0e8a70c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2546,9 +2546,10 @@ function PMA_generate_slider_effect($id, $message) $('<a href="#<?php echo $id; ?>" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>') .insertBefore('#<?php echo $id; ?>') .click(function() { - // the callback should be the 4th parameter but - // it only works as the second parameter - $('#<?php echo $id; ?>').toggle('drop', function() { + // The callback should be the 4th parameter but + // it only works as the second parameter; + // For the possible effects see http://jqueryui.com/demos/show + $('#<?php echo $id; ?>').toggle('clip', function() { PMA_set_status_label_<?php echo $id; ?>(); }); }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1415-g4dddaab
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via 4dddaab5fe5dc0e703db907b5ee40d0e522dfd3f (commit) from 5bae920417fbc993a262e4e93af00f02ae225efe (commit) - Log ----------------------------------------------------------------- commit 4dddaab5fe5dc0e703db907b5ee40d0e522dfd3f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 17:29:32 2011 -0500 Fix displaying of "Show search criteria/Hide search criteria" ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index 3c6cae3..48cf97b 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -22,23 +22,28 @@ $(document).ready(function() { cache: 'false' }); - $('<a id="togglesearchform"></a>') - .html(PMA_messages['strShowSearchCriteria']) + /** + * Prepare a div containing a link, otherwise it's incorrectly displayed + * after a couple of clicks + */ + $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>') .insertAfter('#tbl_search_form') // don't show it until we have results on-screen .hide(); - $('#togglesearchform').bind('click', function() { - var $link = $(this); - $('#tbl_search_form').slideToggle(); - if ($link.text() == PMA_messages['strHideSearchCriteria']) { - $link.text(PMA_messages['strShowSearchCriteria']); - } else { - $link.text(PMA_messages['strHideSearchCriteria']); - } - // avoid default click action - return false; - }) + $('#togglesearchformlink') + .html(PMA_messages['strShowSearchCriteria']) + .bind('click', function() { + var $link = $(this); + $('#tbl_search_form').slideToggle(); + if ($link.text() == PMA_messages['strHideSearchCriteria']) { + $link.text(PMA_messages['strShowSearchCriteria']); + } else { + $link.text(PMA_messages['strHideSearchCriteria']); + } + // avoid default click action + return false; + }); /** * Ajax event handler for Table Search @@ -65,10 +70,11 @@ $(document).ready(function() { $("#sqlqueryresults").html(response); $("#sqlqueryresults").trigger('appendAnchor'); $('#tbl_search_form').hide(); - $('#togglesearchform') + $('#togglesearchformlink') // always start with the Show message .text(PMA_messages['strShowSearchCriteria']) - // now it's time to show the link + $('#togglesearchformdiv') + // now it's time to show the div containing the link .show(); } else { // error message (zero rows) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1414-g5bae920
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via 5bae920417fbc993a262e4e93af00f02ae225efe (commit) from 3a2e9d425faeb63f7929b977663229161ad0ee78 (commit) - Log ----------------------------------------------------------------- commit 5bae920417fbc993a262e4e93af00f02ae225efe Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 16:34:20 2011 -0500 Handle null checkboxes inside rows generated by "Continue insertion" ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 736317d..ebd88ff 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -9,7 +9,7 @@ */ /** - * Modify from controls when the "NULL" checkbox is selected + * Modify form controls when the "NULL" checkbox is checked * * @param theType string the MySQL field type * @param urlField string the urlencoded field name - OBSOLETE @@ -243,7 +243,9 @@ $(document).ready(function() { $('.foreign_values_anchor').show(); /** - * Handles all current checkboxes for Null + * Handles all current checkboxes for Null; this only takes care of the + * checkboxes on currently displayed rows as the rows generated by + * "Continue insertion" are handled in the "Continue insertion" code * */ $('.checkbox_null').bind('click', function(e) { @@ -407,12 +409,20 @@ $(document).ready(function() { if ($this_element.is('.checkbox_null')) { $this_element + // this event was bound earlier by jQuery but + // to the original row, not the cloned one, so unbind() + .unbind('click') + // Keep these values to be used when the element + // will be clicked + .data('hashed_field', hashed_field) + .data('new_row_index', new_row_index) .bind('click', function(e) { + var $changed_element = $(this); nullify( - $this_element.siblings('.nullify_code').val(), + $changed_element.siblings('.nullify_code').val(), $this_element.closest('tr').find('input:hidden').first().val(), - hashed_field, - '[multi_edit][' + new_row_index + ']' + $changed_element.data('hashed_field'), + '[multi_edit][' + $changed_element.data('new_row_index') + ']' ); }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1413-g3a2e9d4
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via 3a2e9d425faeb63f7929b977663229161ad0ee78 (commit) from 027f4286edcf9151faa886db5b5fa1bc8b18271b (commit) - Log ----------------------------------------------------------------- commit 3a2e9d425faeb63f7929b977663229161ad0ee78 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 11:19:18 2011 -0500 Remove old onchange attribute ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index ed13f38..736317d 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -388,6 +388,9 @@ $(document).ready(function() { $this_element .attr('value', '') .unbind('change') + // Remove onchange attribute that was placed + // by tbl_change.php; it refers to the wrong row index + .attr('onchange', null) // Keep these values to be used when the element // will change .data('hashed_field', hashed_field) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1412-g027f428
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via 027f4286edcf9151faa886db5b5fa1bc8b18271b (commit) from e9ee1615e75919c8963caa1af8e0fd73222b081c (commit) - Log ----------------------------------------------------------------- commit 027f4286edcf9151faa886db5b5fa1bc8b18271b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 10:59:08 2011 -0500 Rename function to a better name ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 6 +++--- tbl_change.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 09e8264..ed13f38 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -155,8 +155,8 @@ function isTime(val) return false; return true; } -//validate the datetime and integer -function Validator(urlField, multi_edit,theType){ + +function verificationsAfterFieldChange(urlField, multi_edit,theType){ var rowForm = document.forms['insertForm']; var evt = window.event || arguments.callee.caller.arguments[0]; var target = evt.target || evt.srcElement; @@ -394,7 +394,7 @@ $(document).ready(function() { .data('new_row_index', new_row_index) .bind('change', function(e) { var $changed_element = $(this); - Validator( + verificationsAfterFieldChange( $changed_element.data('hashed_field'), $changed_element.data('new_row_index'), $changed_element.closest('tr').find('span.column_type').html() diff --git a/tbl_change.php b/tbl_change.php index 5724303..8a594d1 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -406,7 +406,7 @@ foreach ($rows as $row_id => $vrow) { $field['len'] = PMA_DBI_field_len($vresult, $i); } //Call validation when the form submited... - $unnullify_trigger = $chg_evt_handler . "=\"return Validator('". PMA_escapeJsString($field['Field_md5']) . "', '" + $unnullify_trigger = $chg_evt_handler . "=\"return verificationsAfterFieldChange('". PMA_escapeJsString($field['Field_md5']) . "', '" . PMA_escapeJsString($jsvkey) . "','".$field['pma_type']."')\""; // Use an MD5 as an array index to avoid having special characters in the name atttibute (see bug #1746964 ) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1411-ge9ee161
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via e9ee1615e75919c8963caa1af8e0fd73222b081c (commit) from 032d6d5e0cbd16a071bbfe70f68d5008f3a07727 (commit) - Log ----------------------------------------------------------------- commit e9ee1615e75919c8963caa1af8e0fd73222b081c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 10:52:17 2011 -0500 Function was called from just one place to fold it inside caller; also recode it with jQuery ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 66f5976..09e8264 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -160,7 +160,12 @@ function Validator(urlField, multi_edit,theType){ var rowForm = document.forms['insertForm']; var evt = window.event || arguments.callee.caller.arguments[0]; var target = evt.target || evt.srcElement; - unNullify(urlField, multi_edit); + + // Unchecks the corresponding "NULL" control + $("input[name='fields_null[multi_edit][" + multi_edit + "][" + urlField + "]']").attr({'checked': false}); + + // Unchecks the Ignore checkbox for the current row + $("input[name='insert_ignore_" + multi_edit + "']").attr({'checked': false}); if(target.name.substring(0,6)=="fields") { @@ -226,30 +231,6 @@ function Validator(urlField, multi_edit,theType){ /* End of datetime validation*/ /** - * Unchecks the "NULL" control when a function has been selected or a value - * entered - * - * @param string the urlencoded field name - * @param string the multi_edit row sequence number - * - * @return boolean always true - */ -function unNullify(urlField, multi_edit) -{ - var rowForm = document.forms['insertForm']; - - if (typeof(rowForm.elements['fields_null[multi_edit][' + multi_edit + '][' + urlField + ']']) != 'undefined') { - rowForm.elements['fields_null[multi_edit][' + multi_edit + '][' + urlField + ']'].checked = false - } // end if - - if (typeof(rowForm.elements['insert_ignore_' + multi_edit]) != 'undefined') { - rowForm.elements['insert_ignore_' + multi_edit].checked = false - } // end if - - return true; -} // end of the 'unNullify()' function - -/** * Ajax handlers for Change Table page * * Actions Ajaxified here: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1410-g032d6d5
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via 032d6d5e0cbd16a071bbfe70f68d5008f3a07727 (commit) from cfca67f4229d480b34dc5e5ca49cb3ea5e2bb911 (commit) - Log ----------------------------------------------------------------- commit 032d6d5e0cbd16a071bbfe70f68d5008f3a07727 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 10:10:24 2011 -0500 The Ignore checkbox is not unticked when data is inserted inside rows added with Continue insertion ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 861ee99..66f5976 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -407,12 +407,16 @@ $(document).ready(function() { $this_element .attr('value', '') .unbind('change') - .attr('onchange', null) + // Keep these values to be used when the element + // will change + .data('hashed_field', hashed_field) + .data('new_row_index', new_row_index) .bind('change', function(e) { + var $changed_element = $(this); Validator( - hashed_field, - new_row_index, - $this_element.closest('tr').find('span.column_type').html() + $changed_element.data('hashed_field'), + $changed_element.data('new_row_index'), + $changed_element.closest('tr').find('span.column_type').html() ); }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_9-5-g066b746
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, QA_3_3 has been updated via 066b746befdacf10d87f2eaf3de8ee68f745a447 (commit) from ba2326d7033e12b4ac134cbb585f016203a93517 (commit) - Log ----------------------------------------------------------------- commit 066b746befdacf10d87f2eaf3de8ee68f745a447 Author: Madhura Jayaratne <madhuracj(a)users.sourceforge.net> Date: Mon Jan 3 08:10:49 2011 -0500 patch #3150164 [structure] Ordering by size gives incorrect results ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/database_interface.lib.php | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14915d2..6c67957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, thanks to erickoh75 - erickoh75 +- patch #3150164 [structure] Ordering by size gives incorrect results, + thanks to Madhura Jayaratne - madhuracj 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 300a925..8da1035 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -367,8 +367,16 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals } else { // Prepare to sort by creating array of the selected sort // value to pass to array_multisort - foreach ($each_tables as $table_name => $table_data) { - ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); + + // Size = Data_length + Index_length + if ($sort_by == 'Data_length') { + foreach ($each_tables as $table_name => $table_data) { + ${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']); + } + } else { + foreach ($each_tables as $table_name => $table_data) { + ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); + } } if ($sort_order == 'DESC') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1409-gcfca67f
by Marc Delisle 03 Jan '11

03 Jan '11

The branch, master has been updated via cfca67f4229d480b34dc5e5ca49cb3ea5e2bb911 (commit) via 55cd2fd898dc2f0aa01c9ef18a4c24f3e25598db (commit) from af4b01024a47127dfaf925353e6e7318f3dcc9c7 (commit) - Log ----------------------------------------------------------------- commit cfca67f4229d480b34dc5e5ca49cb3ea5e2bb911 Merge: af4b01024a47127dfaf925353e6e7318f3dcc9c7 55cd2fd898dc2f0aa01c9ef18a4c24f3e25598db Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 3 08:03:41 2011 -0500 Merge branch 'QA_3_3' commit 55cd2fd898dc2f0aa01c9ef18a4c24f3e25598db Author: Madhura Jayaratne <madhuracj(a)users.sourceforge.net> Date: Mon Jan 3 08:02:28 2011 -0500 patch #3150164 [structure] Ordering by size gives incorrect results ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/database_interface.lib.php | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1ab4ec..5f20f7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,8 @@ 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, thanks to erickoh75 - erickoh75 +- patch #3150164 [structure] Ordering by size gives incorrect results, + thanks to Madhura Jayaratne - madhuracj 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index d5754a4..0877dda 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -355,8 +355,16 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals } else { // Prepare to sort by creating array of the selected sort // value to pass to array_multisort - foreach ($each_tables as $table_name => $table_data) { - ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); + + // Size = Data_length + Index_length + if ($sort_by == 'Data_length') { + foreach ($each_tables as $table_name => $table_data) { + ${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']); + } + } else { + foreach ($each_tables as $table_name => $table_data) { + ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); + } } if ($sort_order == 'DESC') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1407-gaf4b010
by Michal Čihař 03 Jan '11

03 Jan '11

The branch, master has been updated via af4b01024a47127dfaf925353e6e7318f3dcc9c7 (commit) via ba2326d7033e12b4ac134cbb585f016203a93517 (commit) via 08a6fd9c12f1520518b044d87e2a4da189649580 (commit) via 18f50cc043ed16114096b86de56335c3c78c8ad2 (commit) via 97716f5a5a8b2ac24d2965e6b8faf6b747616d85 (commit) via a022d7aa59fbf910626bbebcd9617c95a6c5f5d8 (commit) via abbbd192bfd054545d53600bcbc06be3bce7fbf1 (commit) via eaac45dfda2daa345edc5165b30bedea5a3f18a0 (commit) from 895e69ec2ab82cd3e6fd182e697d3833e310c512 (commit) - Log ----------------------------------------------------------------- commit af4b01024a47127dfaf925353e6e7318f3dcc9c7 Merge: 895e69ec2ab82cd3e6fd182e697d3833e310c512 ba2326d7033e12b4ac134cbb585f016203a93517 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 3 13:52:25 2011 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0