Git November 2010

git@phpmyadmin.net

4 participants
172 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10863-g18b0fa1
by Marc Delisle 16 Nov '10

16 Nov '10

The branch, master has been updated via 18b0fa1482b2056855917367f64374492801f1fb (commit) from 7d465dcebbbeb7dd4c8defce065f539d8c21cbc4 (commit) - Log ----------------------------------------------------------------- commit 18b0fa1482b2056855917367f64374492801f1fb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 16 08:06:02 2010 -0500 inline editable fields were not highlighted or marked in horizontal mode ----------------------------------------------------------------------- Summary of changes: js/functions.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 8bd9449..01db2e6 100644 --- a/js/functions.js +++ b/js/functions.js @@ -847,23 +847,27 @@ function checkTransmitDump(theForm, theAction) } // end of the 'checkTransmitDump()' function /** - * For row marking in horizontal mode (use "live" so that it works also for + * Row marking in horizontal mode (use "live" so that it works also for * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ $(document).ready(function() { $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function() { - $(this).toggleClass('marked'); + var $tr = $(this); + $tr.toggleClass('marked'); + $tr.children().toggleClass('marked'); }); }) /** - * For row highlighting in horizontal mode (necessary for IE 6; use "live" + * Row highlighting in horizontal mode (use "live" * so that it works also for pages reached via AJAX) */ $(document).ready(function() { $('tr.odd, tr.even').live('hover',function() { - $(this).toggleClass('hover'); + var $tr = $(this); + $tr.toggleClass('hover'); + $tr.children().toggleClass('hover'); }); }) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10862-g7d465dc
by Michal Čihař 16 Nov '10

16 Nov '10

The branch, master has been updated via 7d465dcebbbeb7dd4c8defce065f539d8c21cbc4 (commit) via f495fa82ddafb730bf183ecbe0e4db2ab4437797 (commit) via 62e84e624c0195429fedde7bf384aade0fee33d8 (commit) via 6884541fa843baf977b0056c436bc929527735a3 (commit) from 65fcab4122a8feafc07427d2567b919c48b2fa77 (commit) - Log ----------------------------------------------------------------- commit 7d465dcebbbeb7dd4c8defce065f539d8c21cbc4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:47:28 2010 +0200 Translation update done using Pootle. commit f495fa82ddafb730bf183ecbe0e4db2ab4437797 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:47:21 2010 +0200 Translation update done using Pootle. commit 62e84e624c0195429fedde7bf384aade0fee33d8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:47:07 2010 +0200 Translation update done using Pootle. commit 6884541fa843baf977b0056c436bc929527735a3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Nov 15 19:46:42 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index 6a8016e..3dcc0d9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-12 14:06+0100\n" -"PO-Revision-Date: 2010-11-13 06:45+0200\n" +"PO-Revision-Date: 2010-11-15 19:47+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -80,7 +80,7 @@ msgstr "Git" #: browse_foreigners.php:166 browse_foreigners.php:170 #: libraries/Index.class.php:441 tbl_tracking.php:314 msgid "Keyname" -msgstr "Anahtar ismi" +msgstr "Anahtar adı" #: browse_foreigners.php:167 browse_foreigners.php:169 #: server_collations.php:54 server_collations.php:66 server_engines.php:57 @@ -3988,11 +3988,11 @@ msgid "" "comment and the real name" msgstr "" "Eğer araç ipuçları etkinse ve veritabanı yorumu ayarlıysa bu, yorumu ve " -"gerçek ismi çevirecek" +"gerçek adı çevirecek" #: libraries/config/messages.inc.php:452 msgid "Display database comment instead of its name" -msgstr "Veritabanının ismi yerine yorumunu görüntüle" +msgstr "Veritabanının adı yerine yorumunu görüntüle" #: libraries/config/messages.inc.php:453 msgid "" @@ -4008,7 +4008,7 @@ msgstr "" #: libraries/config/messages.inc.php:454 msgid "Display table comment instead of its name" -msgstr "Tablonun ismi yerine yorumunu görüntüle" +msgstr "Tablonun adı yerine yorumunu görüntüle" #: libraries/config/messages.inc.php:455 msgid "Display table comments in tooltips" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10858-g65fcab4
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, master has been updated via 65fcab4122a8feafc07427d2567b919c48b2fa77 (commit) via 63aec5b3280c39277c54d0789a1b511fd2f3b7ae (commit) from 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 (commit) - Log ----------------------------------------------------------------- commit 65fcab4122a8feafc07427d2567b919c48b2fa77 Merge: 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 63aec5b3280c39277c54d0789a1b511fd2f3b7ae Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Nov 14 21:08:28 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3bd70e..92a3a50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js - bug #3077463 [core] Events were not copied when copying/renaming database +- bug #1762306 [core] Copy database with view of a view 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index b5d7f5a..c9aa565 100644 --- a/db_operations.php +++ b/db_operations.php @@ -128,14 +128,15 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { foreach ($tables_full as $each_table => $tmp) { - // to be able to rename a db containing views, we - // first collect in $views all the views we find and we - // will handle them after the tables - /** - * @todo support a view of a view - */ + // to be able to rename a db containing views, + // first all the views are collected and a stand-in is created + // the real views are created after the tables if (PMA_Table::isView($db, $each_table)) { $views[] = $each_table; + // Create stand-in definition to resolve view dependencies + $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_query($sql_view_standin); + $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; continue; } @@ -193,13 +194,19 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // handle the views if (! $_error) { - foreach ($views as $view) { - if (! PMA_Table::moveCopy($db, $view, $newname, $view, - 'structure', $move, 'db_copy')) { - $_error = true; - break; - } - } + // temporarily force to add DROP IF EXIST to CREATE VIEW query, + // to remove stand-in VIEW that was created earlier + $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + $GLOBALS['drop_if_exists'] = 'true'; + + foreach ($views as $view) { + if (! PMA_Table::moveCopy($db, $view, $newname, $view, 'structure', $move, 'db_copy')) { + $_error = true; + break; + } + } + // restore previous value + $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; } unset($view, $views); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-16-g63aec5b
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, QA_3_3 has been updated via 63aec5b3280c39277c54d0789a1b511fd2f3b7ae (commit) from 8277c92e25ce1001c6b0479e91698bcf5c02c618 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c8bef..0ed94ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js - bug #3077463 [core] Events were not copied when copying/renaming database +- bug #1762306 [core] Copy database with view of a view 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index 4004a3d..d3e62c2 100644 --- a/db_operations.php +++ b/db_operations.php @@ -125,14 +125,15 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { foreach ($tables_full as $each_table => $tmp) { - // to be able to rename a db containing views, we - // first collect in $views all the views we find and we - // will handle them after the tables - /** - * @todo support a view of a view - */ + // to be able to rename a db containing views, + // first all the views are collected and a stand-in is created + // the real views are created after the tables if (PMA_Table::isView($db, $each_table)) { $views[] = $each_table; + // Create stand-in definition to resolve view dependencies + $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_query($sql_view_standin); + $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; continue; } @@ -190,13 +191,19 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // handle the views if (! $_error) { - foreach ($views as $view) { - if (! PMA_Table::moveCopy($db, $view, $newname, $view, - 'structure', $move, 'db_copy')) { - $_error = true; - break; - } - } + // temporarily force to add DROP IF EXIST to CREATE VIEW query, + // to remove stand-in VIEW that was created earlier + $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + $GLOBALS['drop_if_exists'] = 'true'; + + foreach ($views as $view) { + if (! PMA_Table::moveCopy($db, $view, $newname, $view, 'structure', $move, 'db_copy')) { + $_error = true; + break; + } + } + // restore previous value + $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; } unset($view, $views); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10856-g57c5abf
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, master has been updated via 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 (commit) via 8277c92e25ce1001c6b0479e91698bcf5c02c618 (commit) via 5f4604c9bb4de2cdc2bf6b61f0ac55c898dd964e (commit) from d9d5abee089ee2570220a04a0aa8e664ab4334dd (commit) - Log ----------------------------------------------------------------- commit 57c5abf579d7ee37eeea5c44c2c62360bd5fe529 Merge: d9d5abee089ee2570220a04a0aa8e664ab4334dd 8277c92e25ce1001c6b0479e91698bcf5c02c618 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sun Nov 14 18:28:10 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_operations.php | 22 ++++++++++++++++++++++ libraries/js_escape.lib.php | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5e8414..d3bd70e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,8 @@ 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand +- bug #3103853 [js] Double quotes were not escaped in generated js +- bug #3077463 [core] Events were not copied when copying/renaming database 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index 288de7b..b5d7f5a 100644 --- a/db_operations.php +++ b/db_operations.php @@ -215,6 +215,28 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { unset($GLOBALS['sql_constraints_query_full_db'], $one_query); } + if (PMA_MYSQL_INT_VERSION >= 50100) { + // here DELIMITER is not used because it's not part of the + // language; each statement is sent one by one + + // to avoid selecting alternatively the current and new db + // we would need to modify the CREATE definitions to qualify + // the db name + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + if ($event_names) { + foreach($event_names as $event_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'EVENT', $event_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); + } + } + } + // go back to current db, just in case + PMA_DBI_select_db($db); + // Duplicate the bookmarks for this db (done once for each db) if (! $_error && $db != $newname) { $get_fields = array('user', 'label', 'query'); diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 5ddb604..0773eec 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -59,6 +59,7 @@ function PMA_escapeJsString($string) "\000" => '', '\\' => '\\\\', '\'' => '\\\'', + '"' => '\"', "\n" => '\n', "\r" => '\r'))); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-15-g8277c92
by Dieter Adriaenssens 14 Nov '10

14 Nov '10

The branch, QA_3_3 has been updated via 8277c92e25ce1001c6b0479e91698bcf5c02c618 (commit) from 5f4604c9bb4de2cdc2bf6b61f0ac55c898dd964e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e45143a..e9c8bef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js +- bug #3077463 [core] Events were not copied when copying/renaming database 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis diff --git a/db_operations.php b/db_operations.php index 29d2635..4004a3d 100644 --- a/db_operations.php +++ b/db_operations.php @@ -212,6 +212,28 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { unset($GLOBALS['sql_constraints_query_full_db'], $one_query); } + if (PMA_MYSQL_INT_VERSION >= 50100) { + // here DELIMITER is not used because it's not part of the + // language; each statement is sent one by one + + // to avoid selecting alternatively the current and new db + // we would need to modify the CREATE definitions to qualify + // the db name + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + if ($event_names) { + foreach($event_names as $event_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'EVENT', $event_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); + } + } + } + // go back to current db, just in case + PMA_DBI_select_db($db); + // Duplicate the bookmarks for this db (done once for each db) if (! $_error && $db != $newname) { $get_fields = array('user', 'label', 'query'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10853-gd9d5abe
by Marc Delisle 14 Nov '10

14 Nov '10

The branch, master has been updated via d9d5abee089ee2570220a04a0aa8e664ab4334dd (commit) from 5a72c4ea7dd375d38cd01c4cf02b31f57b29f15c (commit) - Log ----------------------------------------------------------------- commit d9d5abee089ee2570220a04a0aa8e664ab4334dd Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 14 08:08:14 2010 -0500 adjust totals when dropping a table ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 58 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 23 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index f74cc26..03aa8e1 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -17,6 +17,39 @@ * Drop Table * */ + +/** + * Adjust number of rows and total size in the summary + * when emptying or dropping a table + * + * @param jQuery object $this_anchor + */ +function PMA_adjustTotals($this_anchor) { + var $parent_tr = $this_anchor.closest('tr'); + var $rows_td = $parent_tr.find('.tbl_rows'); + var $size_td = $parent_tr.find('.tbl_size'); + var num_rows = parseInt($rows_td.text()); + // set number of rows to 0 + // (not really needed in case we are dropping the table) + $rows_td.text('0'); + // set size to unknown (not sure how to get the exact + // value here, as an empty InnoDB table would have a size) + $size_td.text('-'); + + // try to compute a new total row number + if (! isNaN(num_rows)) { + $total_rows_td = $('#tbl_summary_row').find('.tbl_rows'); + var total_rows = parseInt($total_rows_td.text()); + if (! isNaN(total_rows)) { + $total_rows_td.text(total_rows - num_rows); + } + } + + // prefix total size with "~" + var $total_size_td = $('#tbl_summary_row').find('.tbl_size'); + $total_size_td.text($total_size_td.text().replace(/^/,'~')); +} + $(document).ready(function() { /** @@ -53,28 +86,7 @@ $(document).ready(function() { //Fetch inner span of this anchor //and replace the icon with its disabled version var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png'); - var $parent_tr = $this_anchor.closest('tr'); - var $rows_td = $parent_tr.find('.tbl_rows'); - var $size_td = $parent_tr.find('.tbl_size'); - var num_rows = parseInt($rows_td.text()); - // set number of rows to 0 - $rows_td.text('0'); - // set size to unknown (not sure how to get the exact - // value here, as an empty InnoDB table would have a size) - $size_td.text('-'); - - // try to compute a new total row number - if (! isNaN(num_rows)) { - $total_rows_td = $('#tbl_summary_row').find('.tbl_rows'); - var total_rows = parseInt($total_rows_td.text()); - if (! isNaN(total_rows)) { - $total_rows_td.text(total_rows - num_rows); - } - } - - // prefix total size with "~" - var $total_size_td = $('#tbl_summary_row').find('.tbl_size'); - $total_size_td.text($total_size_td.text().replace(/^/,'~')); + PMA_adjustTotals($this_anchor); //To disable further attempts to truncate the table, //replace the a element with its inner span (modified) @@ -120,7 +132,7 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if (data.success == true) { PMA_ajaxShowMessage(data.message); - //need to find a better solution here. The icon should be replaced + PMA_adjustTotals($this_anchor); $curr_row.hide("medium").remove(); if (window.parent && window.parent.frame_navigation) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10852-g5a72c4e
by Marc Delisle 14 Nov '10

14 Nov '10

The branch, master has been updated via 5a72c4ea7dd375d38cd01c4cf02b31f57b29f15c (commit) from e16182441861e255b26d0216ae3e531b1c309098 (commit) - Log ----------------------------------------------------------------- commit 5a72c4ea7dd375d38cd01c4cf02b31f57b29f15c Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 14 07:48:48 2010 -0500 unneeded wrapping of jQuery objects; prefix their name with dollar sign ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 1c8c64c..f74cc26 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -97,35 +97,36 @@ $(document).ready(function() { $(".drop_table_anchor").live('click', function(event) { event.preventDefault(); + var $this_anchor = $(this); + //extract current table name and build the question string /** - * @var curr_row Object containing reference to the current row + * @var $curr_row Object containing reference to the current row */ - var curr_row = $(this).parents('tr'); + var $curr_row = $this_anchor.parents('tr'); /** * @var curr_table_name String containing the name of the table to be truncated */ - var curr_table_name = $(curr_row).children('th').children('a').text(); + var curr_table_name = $curr_row.children('th').children('a').text(); /** * @var question String containing the question to be asked for confirmation */ var question = 'DROP TABLE ' + curr_table_name; - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { - if(data.success == true) { + if (data.success == true) { PMA_ajaxShowMessage(data.message); //need to find a better solution here. The icon should be replaced - $(curr_row).hide("medium").remove(); + $curr_row.hide("medium").remove(); if (window.parent && window.parent.frame_navigation) { window.parent.frame_navigation.location.reload(); } - } - else { + } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); } }); // end $.get() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10851-ge161824
by Marc Delisle 14 Nov '10

14 Nov '10

The branch, master has been updated via e16182441861e255b26d0216ae3e531b1c309098 (commit) from eb21b9704137e9ab3e9b1efbc4d65d9bf8e9d04c (commit) - Log ----------------------------------------------------------------- commit e16182441861e255b26d0216ae3e531b1c309098 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 14 07:37:14 2010 -0500 adjust totals when emptying a table; also use classes for more precise handling of td ----------------------------------------------------------------------- Summary of changes: db_structure.php | 8 ++++---- js/db_structure.js | 50 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/db_structure.php b/db_structure.php index d5c960d..416e1cc 100644 --- a/db_structure.php +++ b/db_structure.php @@ -381,7 +381,7 @@ foreach ($tables as $keyname => $each_table) { $show_superscript = ''; } ?> - <td class="value"><?php echo $row_count_pre . PMA_formatNumber($each_table['TABLE_ROWS'], 0) . $show_superscript; ?></td> + <td class="value tbl_rows"><?php echo $row_count_pre . PMA_formatNumber($each_table['TABLE_ROWS'], 0) . $show_superscript; ?></td> <?php if (!($cfg['PropertiesNumColumns'] > 1)) { ?> <td nowrap="nowrap"><?php echo ($table_is_view ? __('View') : $each_table['ENGINE']); ?></td> <?php if (isset($collation)) { ?> @@ -390,7 +390,7 @@ foreach ($tables as $keyname => $each_table) { <?php } ?> <?php if ($is_show_stats) { ?> - <td class="value"><a + <td class="value tbl_size"><a href="tbl_structure.php?<?php echo $tbl_url_query; ?>#showusage" ><?php echo $formatted_size . ' ' . $unit; ?></a></td> <td class="value"><?php echo $overhead; ?></td> @@ -439,7 +439,7 @@ if ($is_show_stats) { ?> <th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" align="center"> <?php echo __('Sum'); ?></th> - <th class="value"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th> + <th class="value tbl_rows"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th> <?php if (!($cfg['PropertiesNumColumns'] > 1)) { $default_engine = PMA_DBI_get_default_engine(); @@ -458,7 +458,7 @@ if (!($cfg['PropertiesNumColumns'] > 1)) { if ($is_show_stats) { ?> - <th class="value"><?php echo $sum_formatted . ' ' . $unit; ?></th> + <th class="value tbl_size"><?php echo $sum_formatted . ' ' . $unit; ?></th> <th class="value"><?php echo $overhead_formatted . ' ' . $overhead_unit; ?></th> <?php } diff --git a/js/db_structure.js b/js/db_structure.js index 034f56d..1c8c64c 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @fileoverview functions used on the database structure page * @name Database Structure @@ -47,27 +48,40 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { - if(data.success == true) { + if (data.success == true) { PMA_ajaxShowMessage(data.message); - //Fetch inner span of this anchor - //and replace the icon with its disabled version - var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png'); - // find parent td of this anchor - $this_anchor.parent() - // set number of rows to 0 - .next().next().text('0') - // set size to unknown (not sure how to get the exact - // value here, as an empty InnoDB table would have a size) - .next().next().next().text('-'); + //Fetch inner span of this anchor + //and replace the icon with its disabled version + var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png'); + var $parent_tr = $this_anchor.closest('tr'); + var $rows_td = $parent_tr.find('.tbl_rows'); + var $size_td = $parent_tr.find('.tbl_size'); + var num_rows = parseInt($rows_td.text()); + // set number of rows to 0 + $rows_td.text('0'); + // set size to unknown (not sure how to get the exact + // value here, as an empty InnoDB table would have a size) + $size_td.text('-'); + + // try to compute a new total row number + if (! isNaN(num_rows)) { + $total_rows_td = $('#tbl_summary_row').find('.tbl_rows'); + var total_rows = parseInt($total_rows_td.text()); + if (! isNaN(total_rows)) { + $total_rows_td.text(total_rows - num_rows); + } + } - $this_anchor - //To disable further attempts to truncate the table, - //replace the a element with its inner span (modified) - .replaceWith(span) - .removeClass('truncate_table_anchor'); + // prefix total size with "~" + var $total_size_td = $('#tbl_summary_row').find('.tbl_size'); + $total_size_td.text($total_size_td.text().replace(/^/,'~')); - } - else { + //To disable further attempts to truncate the table, + //replace the a element with its inner span (modified) + $this_anchor + .replaceWith(span) + .removeClass('truncate_table_anchor'); + } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); } }) // end $.get() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10850-geb21b97
by Marc Delisle 13 Nov '10

13 Nov '10

The branch, master has been updated via eb21b9704137e9ab3e9b1efbc4d65d9bf8e9d04c (commit) from 30f0b20d38d7100a97e21175d2bdb1379a015333 (commit) - Log ----------------------------------------------------------------- commit eb21b9704137e9ab3e9b1efbc4d65d9bf8e9d04c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 13 17:02:26 2010 -0500 on clicking Empty, really ensure no further click, change icon, adjust number of rows and size ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 611dd92..034f56d 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -27,32 +27,45 @@ $(document).ready(function() { $(".truncate_table_anchor").live('click', function(event) { event.preventDefault(); + /** + * @var $this_anchor Object referring to the anchor clicked + */ + var $this_anchor = $(this); + //extract current table name and build the question string /** * @var curr_table_name String containing the name of the table to be truncated */ - var curr_table_name = $(this).parents('tr').children('th').children('a').text(); + var curr_table_name = $this_anchor.parents('tr').children('th').children('a').text(); /** * @var question String containing the question to be asked for confirmation */ var question = 'TRUNCATE ' + curr_table_name; - /** - * @var this_anchor Object referring to the anchor clicked - */ - var this_anchor = $(this); - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); - //Remove the action's href and class, so as to disable further attempts to truncate the table - // @todo: How to replace the icon with the disabled version? - $(this_anchor) - .removeAttr('href') - .removeClass('.truncate_table_anchor'); + //Fetch inner span of this anchor + //and replace the icon with its disabled version + var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png'); + // find parent td of this anchor + $this_anchor.parent() + // set number of rows to 0 + .next().next().text('0') + // set size to unknown (not sure how to get the exact + // value here, as an empty InnoDB table would have a size) + .next().next().next().text('-'); + + $this_anchor + //To disable further attempts to truncate the table, + //replace the a element with its inner span (modified) + .replaceWith(span) + .removeClass('truncate_table_anchor'); + } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2010