- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-827-gaa0d3cf
by Marc Delisle 20 Feb '11

20 Feb '11

The branch, master has been updated via aa0d3cfc4a4859a2d6e5b2d8a03cdaa8d7a10bbf (commit) from b5c9a2e2b7502e3c995dfbeaa9f7a1f8c11be9ab (commit) - Log ----------------------------------------------------------------- commit aa0d3cfc4a4859a2d6e5b2d8a03cdaa8d7a10bbf Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Feb 20 07:04:08 2011 -0500 Improve display of debugging queries ----------------------------------------------------------------------- Summary of changes: libraries/footer.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index f6222f8..f5385d5 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -79,7 +79,7 @@ if (! empty($_SESSION['debug'])) { } echo '<div>'; - echo count($_SESSION['debug']['queries']) . ' queries executed' + echo count($_SESSION['debug']['queries']) . ' queries executed ' . $sum_exec . ' times in ' . $sum_time . ' seconds'; echo '<pre>'; print_r($_SESSION['debug']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-826-gb5c9a2e
by Michal Čihař 20 Feb '11

20 Feb '11

The branch, master has been updated via b5c9a2e2b7502e3c995dfbeaa9f7a1f8c11be9ab (commit) from 192d0edae612239aa13e36b8f1f2628fb41ed148 (commit) - Log ----------------------------------------------------------------- commit b5c9a2e2b7502e3c995dfbeaa9f7a1f8c11be9ab Author: Michal Čihař <michal(a)cihar.com> Date: Sun Feb 20 07:53:48 2011 +0100 Adjust header ----------------------------------------------------------------------- Summary of changes: po/ml.po | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/ml.po b/po/ml.po index 0cbdc4b..ad35dcc 100644 --- a/po/ml.po +++ b/po/ml.po @@ -1,17 +1,15 @@ # phpMyAdmin translation. # 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: PACKAGE VERSION\n" +"Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\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" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: \n" +"PO-Revision-Date: 2011-02-10 14:03+0100\n" +"Last-Translator: Michal Čihař <michal(a)cihar.com>\n" +"Language-Team: Malayalam <ml(a)li.org>\n" +"Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 80d0d04c34d704b3de5f414a3a38c44338d90d76
by Michal Čihař 20 Feb '11

20 Feb '11

The branch, master has been updated via 80d0d04c34d704b3de5f414a3a38c44338d90d76 (commit) from 1dea153466960c33a6c5c5dc3026f8b1b66fcfcc (commit) - Log ----------------------------------------------------------------- commit 80d0d04c34d704b3de5f414a3a38c44338d90d76 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Feb 20 07:54:56 2011 +0100 Add Malayalam ----------------------------------------------------------------------- Summary of changes: data/langnames.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/data/langnames.py b/data/langnames.py index 7b9768c..91d3b7c 100644 --- a/data/langnames.py +++ b/data/langnames.py @@ -53,6 +53,7 @@ MAP = { 'lt' : 'lithuanian', 'lv' : 'latvian', 'mk' : 'macedonian_cyrillic', + 'ml' : 'malayalam', 'mn' : 'mongolian', 'ms' : 'malay', 'nl' : 'dutch', hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-825-g192d0ed
by Madhura Jayaratne 20 Feb '11

20 Feb '11

The branch, master has been updated via 192d0edae612239aa13e36b8f1f2628fb41ed148 (commit) from bcc3ed17a21fff47fc024af215a387709cf2c99d (commit) - Log ----------------------------------------------------------------- commit 192d0edae612239aa13e36b8f1f2628fb41ed148 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Feb 20 08:59:07 2011 +0530 Bug #3187078 Main page ajax results tiny. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 4 ---- user_password.php | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/js/functions.js b/js/functions.js index 07c6237..28e89f0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2016,11 +2016,7 @@ $(document).ready(function() { $.post($(the_form).attr('action'), $(the_form).serialize() + '&change_pw='+ this_value, function(data) { if(data.success == true) { - - PMA_ajaxShowMessage(data.message); - $("#topmenucontainer").after(data.sql_query); - $("#change_password_dialog").hide().remove(); $("#edit_user_dialog").dialog("close").remove(); } diff --git a/user_password.php b/user_password.php index d3b577b..9787cc1 100644 --- a/user_password.php +++ b/user_password.php @@ -110,7 +110,7 @@ if (isset($_REQUEST['nopass'])) { $message = PMA_Message::success(__('The profile has been updated.')); if($GLOBALS['is_ajax_request'] == true) { - $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success'); + $extra_data['sql_query'] = PMA_showMessage($message, $sql_query, 'success'); PMA_ajaxResponse($message, true, $extra_data); } hooks/post-receive -- phpMyAdmin

1 0

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

19 Feb '11

The branch, master has been updated via bcc3ed17a21fff47fc024af215a387709cf2c99d (commit) from 8b76f42be2330646c473d6fc2d51a1c105b624fb (commit) - Log ----------------------------------------------------------------- commit bcc3ed17a21fff47fc024af215a387709cf2c99d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 17:47:05 2011 -0500 Temporary trick to add a spacer, feel free to improve... ----------------------------------------------------------------------- Summary of changes: js/sql.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index 2e896ee..3e6c974 100644 --- a/js/sql.js +++ b/js/sql.js @@ -203,6 +203,10 @@ $(document).ready(function() { $link.siblings().slideToggle("fast"); if ($link.text() == PMA_messages['strHideQueryBox']) { $link.text(PMA_messages['strShowQueryBox']); + // cheap trick to add a spacer between the menu tabs + // and "Show query box"; feel free to improve! + $('#togglequerybox_spacer').remove(); + $link.before('<br id="togglequerybox_spacer" />'); } else { $link.text(PMA_messages['strHideQueryBox']); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 0f4b26d74857118aece09152e6fbf0f1cda15b74
by Michal Čihař 19 Feb '11

19 Feb '11

The branch, master has been updated via 0f4b26d74857118aece09152e6fbf0f1cda15b74 (commit) from 598a2ad9ad597d275b7aafb01e11c20668cd9f69 (commit) - Log ----------------------------------------------------------------- commit 0f4b26d74857118aece09152e6fbf0f1cda15b74 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Feb 19 18:48:49 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index 3ec2ed1..a85c5c4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-09 22:43+0100\n" -"PO-Revision-Date: 2011-02-16 19:58+0200\n" +"PO-Revision-Date: 2011-02-19 18:48+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -1567,6 +1567,12 @@ msgid "" "web servers are case–sensitive. Don’t forget the trailing slash " "at the end." msgstr "" +"phpMyAdmin kurulumunuzun dizinine tam <abbr title=\"Uniform Resource " +"Locator\">URL</abbr> (tam yol ile) burada ayarlar. Örn. " +"<tt>http://www.siteniz.net/phpMyAdmin_dizininizin_yolu/</tt>. Aynı zamanda " +"unutmayın, bazı web sunucularında <abbr title=\"Uniform Resource " +"Locator\">URL</abbr> büyük küçük harfe duyarlıdır. En sondaki takip eden bölü " +"işaretini unutmayın." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:594 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[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