- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-8-g4b3d5c7
by Michal Čihař 01 Nov '10

01 Nov '10

The branch, QA_3_3 has been updated via 4b3d5c768bc0c1db2d5f1c986027dc2ec0ca3f63 (commit) from 252ab527bc485db3f8987433ea7b1d1baa371ea8 (commit) - Log ----------------------------------------------------------------- commit 4b3d5c768bc0c1db2d5f1c986027dc2ec0ca3f63 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Nov 1 10:05:21 2010 +0100 Update from master. ----------------------------------------------------------------------- Summary of changes: lang/slovenian-utf-8.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 793334e..982db1a 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -8,7 +8,7 @@ $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = '.'; $number_decimal_separator = ','; // shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa -$byteUnits = array('Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'); +$byteUnits = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'); $day_of_week = array('Ned', 'Pon', 'Tor', 'Sre', 'Čet', 'Pet', 'Sob'); $month = array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Avg', 'Sep', 'Okt', 'Nov', 'Dec'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10716-g1947baa
by Michal Čihař 01 Nov '10

01 Nov '10

The branch, master has been updated via 1947baa1ac9ca7fb4b7e1fff856dacf15f45796c (commit) via 252ab527bc485db3f8987433ea7b1d1baa371ea8 (commit) from 473181a8a3e773711bc8adcbe05c1918b4120457 (commit) - Log ----------------------------------------------------------------- commit 1947baa1ac9ca7fb4b7e1fff856dacf15f45796c Merge: 473181a8a3e773711bc8adcbe05c1918b4120457 252ab527bc485db3f8987433ea7b1d1baa371ea8 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Nov 1 10:03:27 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/db_table_exists.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index af75991..8eb93e4 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -73,7 +73,7 @@ if (empty($is_table) && !defined('PMA_SUBMIT_MULT') && ! defined('TABLE_MAY_BE_A } if (! $is_table) { - require 'db_sql.php'; + require './db_sql.php'; exit; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-7-g252ab52
by Michal Čihař 01 Nov '10

01 Nov '10

The branch, QA_3_3 has been updated via 252ab527bc485db3f8987433ea7b1d1baa371ea8 (commit) from 540cd447a3f8b8e324daf9ccd2ec8112687a690f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/db_table_exists.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index d1ae16a..e81c4be 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -79,7 +79,7 @@ if (empty($is_table) && !defined('PMA_SUBMIT_MULT') && ! defined('TABLE_MAY_BE_A } if (! $is_table) { - require 'db_sql.php'; + require './db_sql.php'; exit; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10714-g473181a
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via 473181a8a3e773711bc8adcbe05c1918b4120457 (commit) from 91a64c1ee2b4720c2ae481e1de49bb9b1111ca91 (commit) - Log ----------------------------------------------------------------- commit 473181a8a3e773711bc8adcbe05c1918b4120457 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 18:06:44 2010 -0400 prefix for variable holding jQuery object; remove extra wrapping for the object ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index b38eeac..14fd11a 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -302,9 +302,9 @@ $(document).ready(function() { .after(data.sql_query); //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() - var notice_class = $("#topmenucontainer").next("div").find('.notice'); - if($(notice_class).text() == '') { - $(notice_class).remove(); + var $notice_class = $("#topmenucontainer").next("div").find('.notice'); + if ($notice_class.text() == '') { + $notice_class.remove(); } var submit_type = $form.find("select[name='submit_type']").val(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10713-g91a64c1
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via 91a64c1ee2b4720c2ae481e1de49bb9b1111ca91 (commit) from 98066b6bcb0d25f87b718d7ee70ddfbe759b43ff (commit) - Log ----------------------------------------------------------------- commit 91a64c1ee2b4720c2ae481e1de49bb9b1111ca91 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 18:01:31 2010 -0400 bug 3084745 (error when editing and changing nothing) ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 51aa788..b38eeac 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -291,29 +291,35 @@ $(document).ready(function() { } $.post($form.attr('action'), $form.serialize(), function(data) { - if(data.success == true) { - PMA_ajaxShowMessage(data.message); - - $("#topmenucontainer") - .next('div') - .remove() - .end() - .after(data.sql_query); - - //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() - var notice_class = $("#topmenucontainer").next("div").find('.notice'); - if($(notice_class).text() == '') { - $(notice_class).remove(); - } + if (typeof data.success != 'undefined') { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } - var submit_type = $form.find("select[name='submit_type']").val(); - if ('insert' == submit_type || 'insertignore' == submit_type) { - //Clear the data in the forms - $form.find('input:reset').trigger('click'); + var submit_type = $form.find("select[name='submit_type']").val(); + if ('insert' == submit_type || 'insertignore' == submit_type) { + //Clear the data in the forms + $form.find('input:reset').trigger('click'); + } + } else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); } - } - else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); + } else { + //happens for example when no change was done while editing + $('#insertForm').remove(); + $('#topmenucontainer').after('<div id="sqlqueryresults"></div>'); + $('#sqlqueryresults').html(data); } }) }) // end submission of data to be inserted into table hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10712-g98066b6
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via 98066b6bcb0d25f87b718d7ee70ddfbe759b43ff (commit) from af0591e1904ecdf61714673f7955b15629aa369e (commit) - Log ----------------------------------------------------------------- commit 98066b6bcb0d25f87b718d7ee70ddfbe759b43ff Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 17:30:33 2010 -0400 prefix for variable holding jQuery object; remove extra wrapping for the object ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index db0d609..f4fe3ae 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -165,17 +165,17 @@ $(document).ready(function() { button_options[PMA_messages['strCreateUser']] = function() { /** - * @var the_form stores reference to current form + * @var $form stores reference to current form */ - var the_form = $(this).find("#addUsersForm"); + var $form = $(this).find("#addUsersForm"); - if( ! checkAddUser($(the_form).get(0)) ) { + if( ! checkAddUser($form.get(0)) ) { PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); return false; } //We also need to post the value of the submit button in order to get this to work correctly - $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { + $.post($form.attr('action'), $form.serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { if(data.success == true) { $("#add_user_dialog").dialog("close").remove(); PMA_ajaxShowMessage(data.message); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10711-gaf0591e
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via af0591e1904ecdf61714673f7955b15629aa369e (commit) from 00d786e9833b89ac9e865ed5bc972196f8259cca (commit) - Log ----------------------------------------------------------------- commit af0591e1904ecdf61714673f7955b15629aa369e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 17:24:40 2010 -0400 re-indent ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 65 +++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 33 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 519f9f9..db0d609 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -164,40 +164,39 @@ $(document).ready(function() { var button_options = {}; button_options[PMA_messages['strCreateUser']] = function() { - /** - * @var the_form stores reference to current form - */ - var the_form = $(this).find("#addUsersForm"); - - if( ! checkAddUser($(the_form).get(0)) ) { - PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); - return false; - } - - //We also need to post the value of the submit button in order to get this to work correctly - $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { - if(data.success == true) { - $("#add_user_dialog").dialog("close").remove(); - PMA_ajaxShowMessage(data.message); - $("#topmenucontainer") - .next('div') - .remove() - .end() - .after(data.sql_query); + /** + * @var the_form stores reference to current form + */ + var the_form = $(this).find("#addUsersForm"); + + if( ! checkAddUser($(the_form).get(0)) ) { + PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); + return false; + } + + //We also need to post the value of the submit button in order to get this to work correctly + $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { + if(data.success == true) { + $("#add_user_dialog").dialog("close").remove(); + PMA_ajaxShowMessage(data.message); + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); - //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() - var notice_class = $("#topmenucontainer").next("div").find('.notice'); - if($(notice_class).text() == '') { - $(notice_class).remove(); - } - - appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); - } - else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); - } - }) - }; + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } + + appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); + } else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); + } + }) + }; button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} $.get($(this).attr("href"), {'ajax_request':true}, function(data) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10710-g00d786e
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via 00d786e9833b89ac9e865ed5bc972196f8259cca (commit) from 1c9ec217920f5d463637b9aa9a9f0ea640b7b317 (commit) - Log ----------------------------------------------------------------- commit 00d786e9833b89ac9e865ed5bc972196f8259cca Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 16:42:24 2010 -0400 After PK creation, did not obey the reload parameter received ----------------------------------------------------------------------- Summary of changes: js/tbl_structure.js | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 693442e..40397c1 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @fileoverview functions used on the table structure page * @name Table Structure @@ -90,6 +91,9 @@ $(document).ready(function() { if(data.success == true) { PMA_ajaxShowMessage(data.message); $(this).remove(); + if (typeof data.reload != 'undefined') { + window.parent.frame_content.location.reload(); + } } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); @@ -130,4 +134,4 @@ $(document).ready(function() { }) // end $.PMA_confirm() }) //end Drop Primary Key/Index -}) // end $(document).ready() \ No newline at end of file +}) // end $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10709-g1c9ec21
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via 1c9ec217920f5d463637b9aa9a9f0ea640b7b317 (commit) from be5b3b5c6460868f2353ae2211d9a9a0c5f064aa (commit) - Log ----------------------------------------------------------------- commit 1c9ec217920f5d463637b9aa9a9f0ea640b7b317 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 07:37:15 2010 -0400 unnecessary wrapping of a jQuery object; add $ as object prefix ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 700995c..51aa788 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -282,15 +282,15 @@ $(document).ready(function() { /** * @var the_form Object referring to the insertion form */ - var the_form = $(this); + var $form = $(this); event.preventDefault(); PMA_ajaxShowMessage(); - if (! the_form.find('input:hidden').is('#ajax_request_hidden')) { - the_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($(the_form).attr('action'), $(the_form).serialize(), function(data) { + $.post($form.attr('action'), $form.serialize(), function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); @@ -306,10 +306,10 @@ $(document).ready(function() { $(notice_class).remove(); } - var submit_type = the_form.find("select[name='submit_type']").val(); + var submit_type = $form.find("select[name='submit_type']").val(); if ('insert' == submit_type || 'insertignore' == submit_type) { //Clear the data in the forms - $(the_form).find('input:reset').trigger('click'); + $form.find('input:reset').trigger('click'); } } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10708-gbe5b3b5
by Marc Delisle 31 Oct '10

31 Oct '10

The branch, master has been updated via be5b3b5c6460868f2353ae2211d9a9a0c5f064aa (commit) from a1e318fbec97cae0965e843bca50b0a1677222e2 (commit) - Log ----------------------------------------------------------------- commit be5b3b5c6460868f2353ae2211d9a9a0c5f064aa Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 31 07:32:36 2010 -0400 do not append ajax_request more than once ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 3608b40..700995c 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -286,7 +286,9 @@ $(document).ready(function() { event.preventDefault(); PMA_ajaxShowMessage(); - $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + if (! the_form.find('input:hidden').is('#ajax_request_hidden')) { + the_form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) { if(data.success == true) { hooks/post-receive -- phpMyAdmin

1 0