- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-823-g8b76f42
by Michal Čihař 19 Feb '11

19 Feb '11

The branch, master has been updated via 8b76f42be2330646c473d6fc2d51a1c105b624fb (commit) via 8de36b2de6f33b85d8dcba0483fd88996e2e8ba7 (commit) from 0899300962ff0cc98767807e234c372a5054ab17 (commit) - Log ----------------------------------------------------------------- commit 8b76f42be2330646c473d6fc2d51a1c105b624fb Merge: 8de36b2de6f33b85d8dcba0483fd88996e2e8ba7 0899300962ff0cc98767807e234c372a5054ab17 Author: Pootle server <pootle(a)cihar.com> Date: Sat Feb 19 22:40:04 2011 +0100 Merge remote-tracking branch 'origin/master' commit 8de36b2de6f33b85d8dcba0483fd88996e2e8ba7 Author: Pootle server <pootle(a)cihar.com> Date: Sat Feb 19 21:48:53 2011 +0100 Start Malayalam ----------------------------------------------------------------------- Summary of changes: po/{phpmyadmin.pot => ml.po} | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) copy po/{phpmyadmin.pot => ml.po} (99%) diff --git a/po/phpmyadmin.pot b/po/ml.po similarity index 99% copy from po/phpmyadmin.pot copy to po/ml.po index 4862726..0cbdc4b 100644 --- a/po/phpmyadmin.pot +++ b/po/ml.po @@ -2,11 +2,10 @@ # Copyright (C) 2003 - 2011 phpMyAdmin devel team # This file is distributed under the same license as the phpMyAdmin package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# #, fuzzy msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-17 11:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -14,9 +13,9 @@ msgstr "" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"X-Generator: Translate Toolkit 1.7.0\n" #: browse_foreigners.php:35 browse_foreigners.php:53 #: libraries/display_tbl.lib.php:415 server_privileges.php:1600 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-821-g0899300
by Madhura Jayaratne 19 Feb '11

19 Feb '11

The branch, master has been updated via 0899300962ff0cc98767807e234c372a5054ab17 (commit) from 52820d2d7044d862bff9e22eb7acb7abc739ee5e (commit) - Log ----------------------------------------------------------------- commit 0899300962ff0cc98767807e234c372a5054ab17 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Feb 20 02:31:41 2011 +0530 Bug #3187096 [AJAX] Dropdown not displayed for foreign keyed fields ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 6fa24cd..a57abb2 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1235,11 +1235,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { for ($i = 0; $i < $fields_cnt; ++$i) { $meta = $fields_meta[$i]; $not_null_class = $meta->not_null ? 'not_null' : ''; + $relation_class = isset($map[$meta->name]) ? 'relation' : ''; $pointer = $i; $is_field_truncated = false; //If the previous column had blob data, we need to reset the class // to $inline_edit_class - $class = 'data ' . $inline_edit_class . ' ' . $not_null_class . ' ' . $alternating_color_class; + $class = 'data ' . $inline_edit_class . ' ' . $not_null_class . ' ' . $alternating_color_class . ' ' . $relation_class; // See if this column should get highlight because it's used in the // where-query. @@ -2427,7 +2428,6 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m $result = ' class="' . $class . ($condition_field ? ' condition' : '') . $nowrap . ' ' . ($is_field_truncated ? ' truncated' : '') . ($transform_function != $default_function ? ' transformed' : '') - . (isset($map[$meta->name]) ? ' relation' : '') . $enum_class . $mime_type_class . '">'; if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-820-g52820d2
by Madhura Jayaratne 19 Feb '11

19 Feb '11

The branch, master has been updated via 52820d2d7044d862bff9e22eb7acb7abc739ee5e (commit) via 7bed3852899c1ddcb605103e9a0ebe20dd587a4f (commit) via c5b0afd16eec37241ec34de24de329d684aec525 (commit) via 81974e6d93d3a7ead5d9d20ccb66a06e80d76f8e (commit) via 8e64a94360c47b33f7b05d5efc278a3d5a6011a2 (commit) from 4c7aa9cfee0f6135501242fb5708cfed40cc6be0 (commit) - Log ----------------------------------------------------------------- commit 52820d2d7044d862bff9e22eb7acb7abc739ee5e Merge: 7bed3852899c1ddcb605103e9a0ebe20dd587a4f 4c7aa9cfee0f6135501242fb5708cfed40cc6be0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Feb 20 01:19:32 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 7bed3852899c1ddcb605103e9a0ebe20dd587a4f Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Feb 20 01:05:37 2011 +0530 Uncheck 'null checkbox' when the editor area is changed. commit c5b0afd16eec37241ec34de24de329d684aec525 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Feb 20 01:03:07 2011 +0530 Tab and white space clean up. commit 81974e6d93d3a7ead5d9d20ccb66a06e80d76f8e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Feb 20 00:46:29 2011 +0530 CSS styles for null checkbox and for NULL values in table cells. commit 8e64a94360c47b33f7b05d5efc278a3d5a6011a2 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Feb 19 22:50:43 2011 +0530 Bug #3185756 [AJAX] Inline edit and NULL columns ----------------------------------------------------------------------- Summary of changes: js/sql.js | 253 ++++++++++++++++++------------- libraries/display_tbl.lib.php | 3 +- themes/original/css/theme_right.css.php | 14 ++ 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/js/sql.js b/js/sql.js index 219b28c..2e896ee 100644 --- a/js/sql.js +++ b/js/sql.js @@ -227,9 +227,9 @@ $(document).ready(function() { $form = $(this); PMA_ajaxShowMessage(); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { @@ -429,14 +429,57 @@ $(document).ready(function() { * @see getFieldName() */ var field_name = getFieldName($this_field, disp_mode); + /** + * @var relation_curr_value String current value of the field (for fields that are foreign keyed). + */ + var relation_curr_value = $this_field.find('a').text(); + /** + * @var enum_curr_value String current value of the field (for fields that are of type enum). + */ + var enum_curr_value = $this_field.text(); + + if($this_field.is(':not(.not_null)')){ + // add a checkbox to mark null for all the field that are nullable. + $this_field.html('<div class="null_div">Null :<input type="checkbox" class="checkbox_null_'+ field_name +'"></div>'); + // check the 'checkbox_null_<field_name>' if the value is null + if($this_field.is('.null')) { + $('.checkbox_null_' + field_name).attr('checked', true); + } + + // if the select/editor is changed un-check the 'checkbox_null_<field_name>'. + if ($this_field.is('.enum, .set')) { + var $editor = $this_field.find('select'); + } else if ($this_field.is('.relation')) { + var $editor = $this_field.find('select'); + } else { + var $editor = $this_field.find('textarea'); + } + $editor.live('change', function(e) { + $('.checkbox_null_' + field_name).attr('checked', false); + }) + + // if 'chechbox_null_<field_name>' is clicked empty the select/editor. + $('.checkbox_null_' + field_name).bind('click', function(e) { + if ($this_field.is('.enum, .set')) { + $this_field.find('select').selectedIndex = -1; + } else if ($this_field.is('.relation')) { + $this_field.find('select').attr('value', ''); + } else { + $this_field.find('textarea').empty(); + } + }) + + } else { + $this_field.html('<div class="null_div"></div>'); + } // In each input sibling, wrap the current value in a textarea // and store the current value in a hidden span if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .null)')) { // handle non-truncated, non-transformed, non-relation values // We don't need to get any more data, just wrap the value - $this_field.html('<textarea>'+data_value+'</textarea>') - .append('<span class="original_data">'+data_value+'</span>'); + $this_field.append('<textarea>'+data_value+'</textarea>'); + $this_field.append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); } else if($this_field.is('.truncated, .transformed')) { @@ -457,8 +500,8 @@ $(document).ready(function() { 'inline_edit' : true }, function(data) { if(data.success == true) { - $this_field.html('<textarea>'+data.value+'</textarea>') - .append('<span class="original_data">'+data_value+'</span>'); + $this_field.append('<textarea>'+data.value+'</textarea>'); + $this_field.append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); } else { @@ -471,11 +514,6 @@ $(document).ready(function() { //handle relations /** - * @var curr_value String containing the current value of this relational field - */ - var curr_value = $this_field.find('a').text(); - - /** * @var post_params Object containing parameters for the POST request */ var post_params = { @@ -485,22 +523,18 @@ $(document).ready(function() { 'table' : window.parent.table, 'column' : field_name, 'token' : window.parent.token, - 'curr_value' : curr_value + 'curr_value' : relation_curr_value } $.post('sql.php', post_params, function(data) { - $this_field.html(data.dropdown) - .append('<span class="original_data">'+data_value+'</span>'); + $this_field.append(data.dropdown); + $this_field.append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); }) // end $.post() } else if($this_field.is('.enum')) { /** @lends jQuery */ //handle enum fields - /** - * @var curr_value String containing the current value of this relational field - */ - var curr_value = $this_field.text(); /** * @var post_params Object containing parameters for the POST request @@ -512,19 +546,19 @@ $(document).ready(function() { 'table' : window.parent.table, 'column' : field_name, 'token' : window.parent.token, - 'curr_value' : curr_value + 'curr_value' : enum_curr_value } $.post('sql.php', post_params, function(data) { - $this_field.html(data.dropdown) - .append('<span class="original_data">'+data_value+'</span>'); + $this_field.append(data.dropdown); + $this_field.append('<span class="original_data">'+data_value+'</span>'); $(".original_data").hide(); }) // end $.post() } else if($this_field.is('.null')) { //handle null fields - $this_field.html('<textarea></textarea>') - .append('<span class="original_data">NULL</span>'); + $this_field.append('<textarea></textarea>'); + $this_field.append('<span class="original_data">NULL</span>'); $(".original_data").hide(); } }) @@ -585,10 +619,6 @@ $(document).ready(function() { // Collect values of all fields to submit, we don't know which changed /** - * @var params_to_submit Array containing the name/value pairs of all fields - */ - var params_to_submit = {}; - /** * @var relation_fields Array containing the name/value pairs of relational fields */ var relation_fields = {}; @@ -601,6 +631,11 @@ $(document).ready(function() { */ var transformation_fields = false; + /** + * @var sql_query String containing the SQL query to update this row + */ + var sql_query = 'UPDATE ' + window.parent.table + ' SET '; + $input_siblings.each(function() { /** @lends jQuery */ /** @@ -621,50 +656,43 @@ $(document).ready(function() { if($this_field.is('.transformed')) { transformation_fields = true; } + /** + * @var is_null String capturing whether 'checkbox_null_<field_name>' is checked. + */ + var is_null = $this_field.find('input:checkbox').is(':checked'); + var value; - 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 { - // results from a drop-down - $test_element = $this_field.find('select'); - if ($test_element.length != 0) { - this_field_params[field_name] = $test_element.val(); + if (is_null) { + sql_query += ' ' + field_name + "=NULL , "; + } else { + 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 { + // results from a drop-down + $test_element = $this_field.find('select'); + if ($test_element.length != 0) { + this_field_params[field_name] = $test_element.val(); + } - // results from Browse foreign value - $test_element = $this_field.find('span.curr_value'); - if ($test_element.length != 0) { - this_field_params[field_name] = $test_element.text(); - } + // results from Browse foreign value + $test_element = $this_field.find('span.curr_value'); + if ($test_element.length != 0) { + this_field_params[field_name] = $test_element.text(); + } - if($this_field.is('.relation')) { - $.extend(relation_fields, this_field_params); + if($this_field.is('.relation')) { + $.extend(relation_fields, this_field_params); + } } - } - $.extend(params_to_submit, this_field_params); + sql_query += ' ' + field_name + "='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; + } }) - /** - * @var sql_query String containing the SQL query to update this row - */ - var sql_query = 'UPDATE ' + window.parent.table + ' SET '; - - // $.each() not used here since it cause problems when there is a column - // in the table with the name 'length'. See bug #3184827 - var value; - for (var key in params_to_submit) { - value = params_to_submit[key]; - if (value.length == 0) { - sql_query += ' ' + key + "=NULL, "; - } else { - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; - } - } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); sql_query += ' WHERE ' + PMA_urldecode(where_clause); @@ -706,57 +734,64 @@ $(document).ready(function() { $input_siblings.each(function() { // Inline edit post has been successful. $this_sibling = $(this); - if($this_sibling.is(':not(.relation, .enum)')) { - /** - * @var new_html String containing value of the data field after edit - */ - var new_html = $this_sibling.find('textarea').val(); - - if($this_sibling.is('.transformed')) { - var field_name = getFieldName($this_sibling, disp_mode); - $.each(data.transformations, function(key, value) { - if(key == field_name) { - if($this_sibling.is('.text_plain, .application_octetstream')) { - new_html = value; - return false; + + var is_null = $this_sibling.find('input:checkbox').is(':checked'); + if (is_null) { + $this_sibling.html('NULL'); + $this_sibling.addClass('null'); + } else { + $this_sibling.removeClass('null'); + if($this_sibling.is(':not(.relation, .enum)')) { + /** + * @var new_html String containing value of the data field after edit + */ + var new_html = $this_sibling.find('textarea').val(); + + if($this_sibling.is('.transformed')) { + var field_name = getFieldName($this_sibling, disp_mode); + $.each(data.transformations, function(key, value) { + if(key == field_name) { + if($this_sibling.is('.text_plain, .application_octetstream')) { + new_html = value; + return false; + } + else { + var new_value = $this_sibling.find('textarea').val(); + new_html = $(value).append(new_value); + return false; + } } - else { - var new_value = $this_sibling.find('textarea').val(); + }) + } + } + else { + var new_html = ''; + var new_value = ''; + $test_element = $this_sibling.find('select'); + if ($test_element.length != 0) { + new_value = $test_element.val(); + } + + $test_element = $this_sibling.find('span.curr_value'); + if ($test_element.length != 0) { + new_value = $test_element.text(); + } + + if($this_sibling.is('.relation')) { + var field_name = getFieldName($this_sibling, disp_mode); + $.each(data.relations, function(key, value) { + if(key == field_name) { new_html = $(value).append(new_value); return false; } - } - }) - } - } - else { - var new_html = ''; - var new_value = ''; - $test_element = $this_sibling.find('select'); - if ($test_element.length != 0) { - new_value = $test_element.val(); - } - - $test_element = $this_sibling.find('span.curr_value'); - if ($test_element.length != 0) { - new_value = $test_element.text(); - } - - - if($this_sibling.is('.relation')) { - var field_name = getFieldName($this_sibling, disp_mode); - $.each(data.relations, function(key, value) { - if(key == field_name) { - new_html = $(value).append(new_value); - return false; - } - }) - } - if($this_sibling.is('.enum')) { - new_html = new_value; + }) + } + if($this_sibling.is('.enum')) { + new_html = new_value; + } } + $this_sibling.html(new_html); } - $this_sibling.html(new_html); }) } else { diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a06ac63..6fa24cd 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1234,11 +1234,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // 2. Displays the rows' values for ($i = 0; $i < $fields_cnt; ++$i) { $meta = $fields_meta[$i]; + $not_null_class = $meta->not_null ? 'not_null' : ''; $pointer = $i; $is_field_truncated = false; //If the previous column had blob data, we need to reset the class // to $inline_edit_class - $class = 'data ' . $inline_edit_class . ' ' . $alternating_color_class; + $class = 'data ' . $inline_edit_class . ' ' . $not_null_class . ' ' . $alternating_color_class; // See if this column should get highlight because it's used in the // where-query. diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 272221d..b1bc753 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -159,6 +159,12 @@ fieldset.tblFooters { clear: both; } +div.null_div { + height: 20px; + text-align: center; + font-style:normal; +} + fieldset .formelement { float: <?php echo $left; ?>; margin-<?php echo $right; ?>: 0.5em; @@ -235,6 +241,14 @@ th.condition { border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>; } +/** + * cells with the value NULL + */ +td.null { + font-style: italic; + text-align: <?php echo $right; ?>; +} + table .value { text-align: <?php echo $right; ?>; white-space: normal; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-815-g4c7aa9c
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 4c7aa9cfee0f6135501242fb5708cfed40cc6be0 (commit) from 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a (commit) - Log ----------------------------------------------------------------- commit 4c7aa9cfee0f6135501242fb5708cfed40cc6be0 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 11:20:11 2011 -0500 No need to show the "Hide query box" initially ----------------------------------------------------------------------- Summary of changes: js/sql.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index be6a7ab..219b28c 100644 --- a/js/sql.js +++ b/js/sql.js @@ -192,12 +192,15 @@ $(document).ready(function() { if (! $('#sqlqueryform').find('a').is('#togglequerybox')) { $('<a id="togglequerybox"></a>') .html(PMA_messages['strHideQueryBox']) - .appendTo("#sqlqueryform"); + .appendTo("#sqlqueryform") + // initially hidden because at this point, nothing else + // appears under the link + .hide(); // Attach the toggling of the query box visibility to a click $("#togglequerybox").bind('click', function() { var $link = $(this) - $link.siblings().slideToggle("medium"); + $link.siblings().slideToggle("fast"); if ($link.text() == PMA_messages['strHideQueryBox']) { $link.text(PMA_messages['strShowQueryBox']); } else { @@ -263,6 +266,7 @@ $(document).ready(function() { $('#sqlqueryresults').show(); $("#sqlqueryresults").html(data); $("#sqlqueryresults").trigger('appendAnchor'); + $('#togglequerybox').show(); if($("#togglequerybox").siblings(":visible").length > 0) { $("#togglequerybox").trigger('click'); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-814-g624ec9c
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a (commit) from 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d (commit) - Log ----------------------------------------------------------------- commit 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 10:38:58 2011 -0500 Make edit privileges panel more manageable ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index a18ec9f..5fe8398 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -212,6 +212,7 @@ $(document).ready(function() { width: 800, // height is a workaround for this Chrome problem: // http://bugs.jqueryui.com/ticket/4671 + // also it's interesting to be able to scroll this window height: 600, modal: true, buttons: button_options @@ -322,6 +323,7 @@ $(document).ready(function() { .append(data) .dialog({ width: 900, + height: 600, buttons: button_options }); //dialog options end displayPasswordGenerateButton(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-813-g67339ba
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d (commit) from 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) - Log ----------------------------------------------------------------- commit 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 07:49:49 2011 -0500 Current code has problems with Ajax, for example when creating a user. There are missing headers and this commit is an attempt to fix this situation. ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 14 +++++++++----- libraries/header.inc.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 95aaae6..a4c6a71 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2935,11 +2935,15 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) $response = array_merge($response, $extra_data); } - // Set the Content-Type header to JSON so that jQuery parses the response correctly - if(!isset($GLOBALS['is_header_sent'])) { - header('Cache-Control: no-cache'); - header("Content-Type: application/json"); - } + // Set the Content-Type header to JSON so that jQuery parses the + // response correctly. + // + // At this point, other headers might have been sent; + // even if $GLOBALS['is_header_sent'] is true, + // we have to send these additional headers. + header('Cache-Control: no-cache'); + header("Content-Type: application/json"); + echo json_encode($response); exit; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 1720e80..807ec0a 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -15,7 +15,7 @@ require_once './libraries/common.inc.php'; /** - * If this is an Ajax request, we do not need to generate all this output. + * This is not an Ajax request so we need to generate all this output. */ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-812-g60f85e1
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) from aef93ba59230af6932cbdfea83a1f60d56676794 (commit) - Log ----------------------------------------------------------------- commit 60f85e193449f02cb81550be8dc3476d0b04e812 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:55:51 2011 -0500 Improve full mode navi display when CountTables is false ----------------------------------------------------------------------- Summary of changes: navigation.php | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/navigation.php b/navigation.php index ef191fe..381b561 100644 --- a/navigation.php +++ b/navigation.php @@ -423,18 +423,23 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { . '?' . $common_url_query; ?>', 'main'); return false;"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + // Might be unset if CountTables directive is false + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> <?php } else { - // with only 1 db available we dont need to refresh left frame + // with only 1 db available we dont need to refresh navi frame // on db selection, only phpmain ?> <a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] @@ -442,12 +447,16 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { id="<?php echo htmlspecialchars($db['name']); ?>" title="<?php echo htmlspecialchars($db['comment']); ?>"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-811-gaef93ba
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via aef93ba59230af6932cbdfea83a1f60d56676794 (commit) from 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) - Log ----------------------------------------------------------------- commit aef93ba59230af6932cbdfea83a1f60d56676794 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:44:33 2011 -0500 Bug #3178935 Navigation full mode: no expansion ----------------------------------------------------------------------- Summary of changes: navigation.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index c162aa2..ef191fe 100644 --- a/navigation.php +++ b/navigation.php @@ -453,7 +453,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { </a> <?php } - if ($db['num_tables']) { + if (($GLOBALS['cfg']['Server']['CountTables'] === false) || $db['num_tables']) { if (isset($tables_full[$db['name']])) { $tables = PMA_getTableList($db['name'], $tables_full[$db['name']]); } elseif (isset($tables_full[strtolower($db['name'])])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-810-g8cd7179
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) via da82fe392b0ac802284abee3810aae9f2bc4b381 (commit) from e831df2a32e7aa7f420fca1c65b797891a298fca (commit) - Log ----------------------------------------------------------------- commit 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 Merge: da82fe392b0ac802284abee3810aae9f2bc4b381 e831df2a32e7aa7f420fca1c65b797891a298fca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:56:20 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit da82fe392b0ac802284abee3810aae9f2bc4b381 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:54:36 2011 +0530 Bug #3183970 Losing SQL history ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 18504e2..9588853 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -22,7 +22,7 @@ if (! defined('PHPMYADMIN')) { */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { - // Avoid caching of the number of rows affected; for example, this function + // Avoid caching of the number of rows affected; for example, this function // is called for tracking purposes but we want to display the correct number // of rows affected by the original query, not by the query generated for // tracking. @@ -760,10 +760,6 @@ function PMA_getHistory($username) { $cfgRelation = PMA_getRelationsParam(); - if (isset($_SESSION['sql_history'])) { - return array_reverse($_SESSION['sql_history']); - } - if (! $cfgRelation['historywork']) { return false; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-808-ge831df2
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via e831df2a32e7aa7f420fca1c65b797891a298fca (commit) from 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) - Log ----------------------------------------------------------------- commit e831df2a32e7aa7f420fca1c65b797891a298fca Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 08:23:09 2011 -0500 Bug #3185710 No window with the confirmation of this operation ----------------------------------------------------------------------- Summary of changes: js/sql.js | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 8173b5e..be6a7ab 100644 --- a/js/sql.js +++ b/js/sql.js @@ -230,10 +230,17 @@ $(document).ready(function() { $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { - // fade out previous success message, if any + // fade out previous messages, if any $('.success').fadeOut(); + $('.sqlquery_message').fadeOut(); // show a message that stays on screen $('#sqlqueryform').before(data.message); + // and display the query + $('<div class="sqlquery_message"></div>') + .html(data.sql_query) + .insertBefore('#sqlqueryform'); + // unnecessary div that came from data.sql_query + $('.notice').remove(); $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { hooks/post-receive -- phpMyAdmin

1 0