- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_8RC1, created. RELEASE_3_3_8RC1
by Marc Delisle 18 Oct '10

18 Oct '10

The annotated tag, RELEASE_3_3_8RC1 has been created at f80f1350e9b78fd008ddcfc51d9f53132ebf2dfd (tag) tagging af98b694f4d46ce2a3e357ab6bed41065e12deab (commit) replaces RELEASE_3_3_7 tagged by Marc Delisle on Mon Oct 18 06:12:51 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.8-rc1 Dieter Adriaenssens (6): BIGINT field type added to table analysis on import value can be negative Update library PHPExcel to version 1.7.4 export/copy procedures and routines before tables bug #3062454, Display routines/events also when no tables are defined parameter is already added to url Jaroslaw Glowacki (1): Polish translation update Marc Delisle (7): 3.3.8-dev 3.3.7 release bug #3056023 [import] USE query not working Browsing a table containing geometry columns bug #3038193 [display] Error when editing row with GEOMETRY column support ARIA storage engine as well as its previous name MARIA 3.3.8-rc1 Michal Čihař (5): Merge branch 'MAINT_3_3_7' into QA_3_3 Merge branch 'MAINT_3_3_7' into QA_3_3 Merge branch 'MAINT_3_3_7' into QA_3_3 Merge branch 'MAINT_3_3_7' into QA_3_3 Polish update (#3062614). ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10616-g61851eb
by Marc Delisle 18 Oct '10

18 Oct '10

The branch, master has been updated via 61851eb80d9d7edabf882d898183aac3988f1836 (commit) from 0f156b19dd3692475bd08e9f3b157385771d68b4 (commit) - Log ----------------------------------------------------------------- commit 61851eb80d9d7edabf882d898183aac3988f1836 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 18 06:11:12 2010 -0400 3.3.9-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 166cede..65c9b0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,8 @@ - rfe #2956556 [interface] Allow to wrap enum values. - bug #1669459 [interface] Do not automatically mark PDF schema rows to delete +3.3.9.0 (not yet released) + 3.3.8.0 (not yet released) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-19-g266b8e3
by Marc Delisle 18 Oct '10

18 Oct '10

The branch, QA_3_3 has been updated via 266b8e3aaff8269f65ece2c4531841c8550c0eff (commit) from 2d4b9e2aea9eb6f3914bbfdd574fd13bac424e24 (commit) - Log ----------------------------------------------------------------- commit 266b8e3aaff8269f65ece2c4531841c8550c0eff Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 18 06:09:38 2010 -0400 3.3.9-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2385125..745f1c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.9.0 (not yet released) + 3.3.8.0 (not yet released) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 diff --git a/Documentation.html b/Documentation.html index e896f1f..95a6681 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8-dev - Documentation</title> + <title>phpMyAdmin 3.3.9-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8-dev + 3.3.9-dev Documentation </h1> </div> diff --git a/README b/README index 2b4ba87..334d3dd 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.8-dev + Version 3.3.9-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9ea3b44..ba4aeb8 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.8-dev'); + $this->set('PMA_VERSION', '3.3.9-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 6a788fb..bf2e2da 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8-dev - Official translators</title> + <title>phpMyAdmin 3.3.9-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8-dev + 3.3.9-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_8, created. RELEASE_3_3_7-19-gaf98b69
by Marc Delisle 18 Oct '10

18 Oct '10

The branch, MAINT_3_3_8 has been created at af98b694f4d46ce2a3e357ab6bed41065e12deab (commit) - Log ----------------------------------------------------------------- commit af98b694f4d46ce2a3e357ab6bed41065e12deab Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 18 06:07:07 2010 -0400 3.3.8-rc1 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10615-g0f156b1
by Marc Delisle 17 Oct '10

17 Oct '10

The branch, master has been updated via 0f156b19dd3692475bd08e9f3b157385771d68b4 (commit) from 634db1c81de4545f7d63ff92b66f076b2e329f13 (commit) - Log ----------------------------------------------------------------- commit 0f156b19dd3692475bd08e9f3b157385771d68b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 17 09:40:15 2010 -0400 other fixes for inline edit links in vertical mode ----------------------------------------------------------------------- Summary of changes: js/sql.js | 78 +++++++++++++++++++---------------- libraries/display_tbl.lib.php | 36 ++++------------ libraries/display_tbl_links.lib.php | 33 +++++++++------ 3 files changed, 71 insertions(+), 76 deletions(-) diff --git a/js/sql.js b/js/sql.js index b95418b..457396f 100644 --- a/js/sql.js +++ b/js/sql.js @@ -32,8 +32,8 @@ function getFieldName(this_field_obj, disp_mode) { else { var this_field_index = $(this_field_obj).index(); if(window.parent.text_dir == 'ltr') { - // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors - var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ (this_field_index-4 )+') a').text(); + // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors but index is zero-based so substract 3 + var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text(); } else { var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ this_field_index+') a').text(); @@ -53,27 +53,33 @@ function getFieldName(this_field_obj, disp_mode) { */ function appendInlineAnchor(disp_mode) { if(disp_mode == 'vertical') { - var $cloned_row = $('.edit_row_anchor').removeClass('edit_row_anchor').parent('tr').clone(); + // there can be one or two tr containing this class, depending + // on the ModifyDeleteAtLeft and ModifyDeleteAtRight cfg parameters + $('#table_results tr').find('.edit_row_anchor').parent().each(function() { + var $this_tr = $(this); + var $cloned_tr = $this_tr.clone(); - var $img_object = $cloned_row.find('img:first').attr('title', PMA_messages['strInlineEdit']); + var $img_object = $cloned_tr.find('img:first').attr('title', PMA_messages['strInlineEdit']); - $cloned_row.find('td').addClass('edit_row_anchor') - .find('a').attr('href', '#') - .find('span') - .text(PMA_messages['strInlineEdit']) - .prepend($img_object); + $cloned_tr.find('td') + .find('a').attr('href', '#') + .find('span') + .text(PMA_messages['strInlineEdit']) + .prepend($img_object); - $cloned_row.insertBefore($('.where_clause').parent('tr')); + $cloned_tr.insertAfter($this_tr); + }); - $("#table_results").find('tr:first').find('th') - .attr('rowspan', '4'); + $("#table_results").find('tr').find(':checkbox').closest('tr').find('th') + .attr('rowspan', '4'); } else { $('.edit_row_anchor').each(function() { - $(this).removeClass('edit_row_anchor'); + $this_td = $(this) + $this_td.removeClass('edit_row_anchor'); - var $cloned_anchor = $(this).clone(); + var $cloned_anchor = $this_td.clone(); var $img_object = $cloned_anchor.find('img').attr('title', PMA_messages['strInlineEdit']); @@ -83,8 +89,7 @@ function appendInlineAnchor(disp_mode) { .text(PMA_messages['strInlineEdit']) .prepend($img_object); - $(this).nextAll('.where_clause:eq(0)') - .before($cloned_anchor); + $this_td.after($cloned_anchor); }); $('#rowsDeleteForm').find('thead').find('th').each(function() { @@ -316,7 +321,7 @@ $(document).ready(function() { */ /** - * On click, replace the current field with an input/textarea + * On click, replace the fields of current row with an input/textarea * @memberOf jQuery * @name inline_edit_start * @see PMA_ajaxShowMessage() @@ -482,35 +487,38 @@ $(document).ready(function() { event.preventDefault(); /** - * @var this_row Object referring to current row that is being edited + * @var $this_td Object referring to the td containing the + * "Inline Edit" link that was clicked to save the row that is + * being edited + * */ - var this_row = $(this); + var $this_td = $(this); // Initialize variables if(disp_mode == 'vertical') { /** - * @var this_row_index Index of the current <td> in the parent <tr> + * @var this_td_index Index of the current <td> in the parent <tr> * Current <td> is the inline edit anchor. */ - var this_row_index = $(this).index(); + var this_td_index = $this_td.index(); /** * @var input_siblings Object referring to all inline editable events from same row */ - var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')'); + var input_siblings = $this_td.parents('tbody').find('tr').find('.data_inline_edit:nth('+this_td_index+')'); /** * @var where_clause String containing the WHERE clause to select this row */ - var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val(); + var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val(); } else { - var input_siblings = $(this).parent('tr').find('.data_inline_edit'); - var where_clause = $(this).parent('tr').find('.where_clause').val(); + var input_siblings = $this_td.parent('tr').find('.data_inline_edit'); + var where_clause = $this_td.parent('tr').find('.where_clause').val(); } /** * @var nonunique Boolean, whether this row is unique or not */ - if($(this).is('.nonunique')) { + if($this_td.is('.nonunique')) { var nonunique = 0; } else { @@ -540,32 +548,32 @@ $(document).ready(function() { /** * @var this_field Object referring to this field (<td>) */ - var this_field = $(this); + var $this_field = $(this); /** * @var field_name String containing the name of this field. * @see getFieldName() */ - var field_name = getFieldName($(this), disp_mode); + var field_name = getFieldName($this_field, disp_mode); /** * @var this_field_params Array temporary storage for the name/value of current field */ var this_field_params = {}; - if($(this).is('.transformed')) { + if($this_field.is('.transformed')) { transformation_fields = true; } - if($(this).is(":not(.relation, .enum)")) { - this_field_params[field_name] = $(this).find('textarea').val(); - if($(this).is('.transformed')) { + if($this_field.is(":not(.relation, .enum)")) { + this_field_params[field_name] = $this_field.find('textarea').val(); + if($this_field.is('.transformed')) { $.extend(transform_fields, this_field_params); } } else { - this_field_params[field_name] = $(this).find('select').val(); + this_field_params[field_name] = $this_field.find('select').val(); - if($(this).is('.relation')) { + if($this_field.is('.relation')) { $.extend(relation_fields, this_field_params); } } @@ -619,7 +627,7 @@ $(document).ready(function() { $.post('tbl_replace.php', post_params, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); - $(this_row).removeClass('edit_row_anchor_active').addClass('edit_row_anchor'); + $this_td.removeClass('edit_row_anchor_active').addClass('edit_row_anchor'); $(input_siblings).each(function() { // Inline edit post has been successful. diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 2acf368..0dafdec 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1442,7 +1442,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['edit'][$row_no] = ''; $vertical_display['delete'][$row_no] = ''; $vertical_display['row_delete'][$row_no] = ''; - $vertical_display['where_clause'][$row_no] = ''; } $column_style_vertical = ''; @@ -1466,9 +1465,14 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if (isset($edit_url)) { - $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" - . PMA_linkOrButton($edit_url, $edit_str, array(), false) - . ' </td>' . "\n"; + $vertical_display['edit'][$row_no] .= '<td align="center" class="' . $alternating_color_class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" + . PMA_linkOrButton($edit_url, $edit_str, array(), false); + // Generates the 'where_clause' hidden input field + // for inline ajax edit if required + if(! empty($where_clause) ) { + $vertical_display['edit'][$row_no] .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; + } + $vertical_display['edit'][$row_no] .= '</td>'; } else { unset($vertical_display['edit'][$row_no]); } @@ -1481,13 +1485,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { unset($vertical_display['delete'][$row_no]); } - if( !empty($where_clause) ) { - $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; - } - else { - unset($vertical_display['where_clause'][$row_no]); - } - echo (($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') ? "\n" : ''); $row_no++; } // end while @@ -1500,7 +1497,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { /** * Do display the result table with the vertical direction mode. - * Credits for this feature goes to Garvin Hicking <hicking(a)faktor-e.de>. * * @return boolean always true * @@ -1567,22 +1563,6 @@ function PMA_displayVerticalTable() echo '</tr>' . "\n"; } // end if - // Generates the 'where_clause' hidden input field for inline ajax edit if required - if ( is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 ) ) { - echo '<tr>' . "\n"; - - $foo_counter = 0; - foreach ($vertical_display['where_clause'] as $val) { - if (($foo_counter != 0) && ($_SESSION['tmp_user_values']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['tmp_user_values']['repeat_cells'])) { - echo '<th></th>' . "\n"; - } - - echo $val; - $foo_counter++; - } // end while - echo '</tr>' . "\n"; - } // end if - // Displays data foreach ($vertical_display['desc'] AS $key => $val) { diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index 7398910..43603de 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -26,9 +26,16 @@ if ($doWriteModifyAt == 'left') { . ' </td>' . "\n"; } if (!empty($edit_url)) { - echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" - . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . ' </td>' . "\n"; + echo '<td class="' . $edit_anchor_class . '" align="center">' + . PMA_linkOrButton($edit_url, $edit_str, '', FALSE); + /* + * Where clause for selecting this row uniquely is provided as + * a hidden input. Used by jQuery scripts for handling inline editing + */ + if(! empty($where_clause)) { + echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; + } + echo '</td>'; } if (!empty($del_url)) { echo ' <td align="center">' . "\n" @@ -42,9 +49,16 @@ if ($doWriteModifyAt == 'left') { . ' </td>' . "\n"; } if (!empty($edit_url)) { - echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" - . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . ' </td>' . "\n"; + echo '<td class="' . $edit_anchor_class . '" align="center">' + . PMA_linkOrButton($edit_url, $edit_str, '', FALSE); + /* + * Where clause for selecting this row uniquely is provided as + * a hidden input. Used by jQuery scripts for handling inline editing + */ + if(! empty($where_clause)) { + echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; + } + echo ' </td>'; } if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { echo ' <td align="center">' . "\n" @@ -54,11 +68,4 @@ if ($doWriteModifyAt == 'left') { . ' </td>' . "\n"; } } -/* - * Where clause for selecting this row uniquely is provided as a hidden input. - * Used by jQuery scripts for handling inline editing - */ -if( !empty($where_clause)) { - echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; -} ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10614-g634db1c
by Marc Delisle 15 Oct '10

15 Oct '10

The branch, master has been updated via 634db1c81de4545f7d63ff92b66f076b2e329f13 (commit) from 3859b65affc4d8a8b2522c6b91f31356baf17153 (commit) - Log ----------------------------------------------------------------- commit 634db1c81de4545f7d63ff92b66f076b2e329f13 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 15 13:21:27 2010 -0400 Inline edit in vertical mode ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 1be9960..2acf368 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1107,12 +1107,14 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { echo '</tr>' . "\n"; } // end if + $alternating_color_class = ($odd_row ? 'odd' : 'even'); + $odd_row = ! $odd_row; + if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { // pointer code part - echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'; + echo '<tr class="' . $alternating_color_class . '">'; } - $odd_row = ! $odd_row; // 1. Prepares the row @@ -1222,7 +1224,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $is_field_truncated = false; //If the previous column had blob data, we need to reset the class // to $data_inline_edit_class - $class = $data_inline_edit_class; + $class = $data_inline_edit_class . ' ' . $alternating_color_class; // See if this column should get highlight because it's used in the // where-query. @@ -1454,7 +1456,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { - $vertical_display['row_delete'][$row_no] .= ' <td align="center" class="' . $class . '" ' . $column_style_vertical . '>' . "\n" + $vertical_display['row_delete'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . '" ' . $column_style_vertical . '>' . "\n" . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '[%_PMA_CHECKBOX_DIR_%]" name="rows_to_delete[' . $where_clause_html . ']"' . ' onclick="' . $column_marker_vertical . 'copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'[%_PMA_CHECKBOX_DIR_%]\');"' . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" @@ -1464,7 +1466,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if (isset($edit_url)) { - $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" + $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" . PMA_linkOrButton($edit_url, $edit_str, array(), false) . ' </td>' . "\n"; } else { @@ -1472,7 +1474,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if (isset($del_url)) { - $vertical_display['delete'][$row_no] .= ' <td align="center" class="' . $class . '" ' . $column_style_vertical . '>' . "\n" + $vertical_display['delete'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . '" ' . $column_style_vertical . '>' . "\n" . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), false) . ' </td>' . "\n"; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10613-g3859b65
by Marc Delisle 15 Oct '10

15 Oct '10

The branch, master has been updated via 3859b65affc4d8a8b2522c6b91f31356baf17153 (commit) from 75fd4ba212af4af9ea3cd54d641c6c6281c05f53 (commit) - Log ----------------------------------------------------------------- commit 3859b65affc4d8a8b2522c6b91f31356baf17153 Author: Benjam <benjamwelker(a)users.sourceforge.net> Date: Fri Oct 15 05:56:04 2010 -0400 Two inline edit links appear when parameter ModifyDeleteAtRight set to true ----------------------------------------------------------------------- Summary of changes: js/sql.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index d640c4b..b95418b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -83,7 +83,7 @@ function appendInlineAnchor(disp_mode) { .text(PMA_messages['strInlineEdit']) .prepend($img_object); - $(this).siblings('.where_clause') + $(this).nextAll('.where_clause:eq(0)') .before($cloned_anchor); }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10612-g75fd4ba
by Michal Čihař 15 Oct '10

15 Oct '10

The branch, master has been updated via 75fd4ba212af4af9ea3cd54d641c6c6281c05f53 (commit) via 9909fe1375cd0a13fd44f00dd285228af29389da (commit) via 08e23bad9deaaf3557ab3baf6da0865b188dc6f2 (commit) via fcded6734f300ecd8bf9a30441c5dc9e80800aba (commit) via a590880765e98ad546401ac0f9b10214b5594446 (commit) from 6206cd30f43e8ebb1b60073ea8044f8f88c4434a (commit) - Log ----------------------------------------------------------------- commit 75fd4ba212af4af9ea3cd54d641c6c6281c05f53 Merge: 9909fe1375cd0a13fd44f00dd285228af29389da 6206cd30f43e8ebb1b60073ea8044f8f88c4434a Author: Pootle server <pootle(a)cihar.com> Date: Thu Oct 14 20:40:11 2010 +0200 Merge remote branch 'origin/master' commit 9909fe1375cd0a13fd44f00dd285228af29389da Merge: 08e23bad9deaaf3557ab3baf6da0865b188dc6f2 2ecf4b3641830ea454102360bea5d847417224c5 Author: Pootle server <pootle(a)cihar.com> Date: Thu Oct 14 12:40:30 2010 +0200 Merge remote branch 'origin/master' commit 08e23bad9deaaf3557ab3baf6da0865b188dc6f2 Merge: fcded6734f300ecd8bf9a30441c5dc9e80800aba ad207a415fd2ba6f0e110c9e74ba9ee50a5b25a8 Author: Pootle server <pootle(a)cihar.com> Date: Wed Oct 13 20:40:31 2010 +0200 Merge remote branch 'origin/master' commit fcded6734f300ecd8bf9a30441c5dc9e80800aba Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 13 18:50:52 2010 +0200 Translation update done using Pootle. commit a590880765e98ad546401ac0f9b10214b5594446 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 13 18:50:36 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 463722f..439ba09 100644 --- a/po/fr.po +++ b/po/fr.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-10-04 08:08-0400\n" -"PO-Revision-Date: 2010-10-07 21:14+0200\n" +"PO-Revision-Date: 2010-10-13 18:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -1093,7 +1093,7 @@ msgstr "Montrer zone SQL" #: js/messages.php:86 msgid "Inline Edit" -msgstr "Éditiion sur place" +msgstr "Édition en place" #: js/messages.php:89 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1950,7 +1950,7 @@ msgstr "Valider SQL" #: libraries/common.lib.php:1240 msgid "Inline edit of this query" -msgstr "Éditer cette requête en ligne" +msgstr "Éditer cette requête en place" #: libraries/common.lib.php:1242 msgid "Inline" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10607-g6206cd3
by Marc Delisle 14 Oct '10

14 Oct '10

The branch, master has been updated via 6206cd30f43e8ebb1b60073ea8044f8f88c4434a (commit) from 2ecf4b3641830ea454102360bea5d847417224c5 (commit) - Log ----------------------------------------------------------------- commit 6206cd30f43e8ebb1b60073ea8044f8f88c4434a Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Oct 14 13:06:42 2010 -0400 error when saving an inline-edited row ----------------------------------------------------------------------- Summary of changes: js/sql.js | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 019986a..d640c4b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -8,6 +8,16 @@ */ /** + * decode a string URL_encoded + * + * @param string str + * @return string the URL-decoded string + */ +function PMA_urldecode(str) { + return decodeURIComponent(str.replace(/\+/g, '%20')); +} + +/** * Get the field name for the current field. Required to construct the query * for inline editing * @@ -576,7 +586,7 @@ $(document).ready(function() { }) //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); - sql_query += ' WHERE ' + where_clause; + sql_query += ' WHERE ' + PMA_urldecode(where_clause); /** * @var rel_fields_list String, url encoded representation of {@link relations_fields} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10606-g2ecf4b3
by Marc Delisle 14 Oct '10

14 Oct '10

The branch, master has been updated via 2ecf4b3641830ea454102360bea5d847417224c5 (commit) from 9cbd454fce097639ec023f9c8bee2aa85b0ecdbf (commit) - Log ----------------------------------------------------------------- commit 2ecf4b3641830ea454102360bea5d847417224c5 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Oct 14 06:30:06 2010 -0400 tahoma font was replaced with DejaVuSans ----------------------------------------------------------------------- Summary of changes: libraries/chart/pma_pchart_chart.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/chart/pma_pchart_chart.php b/libraries/chart/pma_pchart_chart.php index 278676a..1dac4cf 100644 --- a/libraries/chart/pma_pchart_chart.php +++ b/libraries/chart/pma_pchart_chart.php @@ -97,7 +97,7 @@ abstract class PMA_pChart_chart extends PMA_chart $this->dataSet = new pData; $this->chart->reportWarnings('GD'); - $this->chart->ErrorFontName = $this->getFontPath().'tahoma.ttf'; + $this->chart->ErrorFontName = $this->getFontPath().'DejaVuSans.ttf'; // initialize colors foreach ($this->getColors() as $key => $color) { @@ -109,7 +109,7 @@ abstract class PMA_pChart_chart extends PMA_chart ); } - $this->chart->setFontProperties($this->getFontPath().'tahoma.ttf', $this->getFontSize()); + $this->chart->setFontProperties($this->getFontPath().'DejaVuSans.ttf', $this->getFontSize()); $this->chart->setImageMap(true, 'mapid'); } hooks/post-receive -- phpMyAdmin

1 0