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
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
The branch, master has been updated
via a1e318fbec97cae0965e843bca50b0a1677222e2 (commit)
from 08c0f4e92115f84e381775a42b7d644309be9163 (commit)
- Log -----------------------------------------------------------------
commit a1e318fbec97cae0965e843bca50b0a1677222e2
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Oct 31 07:27:01 2010 -0400
do not reset form if we are editing
-----------------------------------------------------------------------
Summary of changes:
js/tbl_change.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/js/tbl_change.js b/js/tbl_change.js
index f9c2d43..3608b40 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -273,7 +273,7 @@ $(document).ready(function() {
});
/**
- * Submission of data to be inserted into table
+ * Submission of data to be inserted or updated
*
* @uses PMA_ajaxShowMessage()
*/
@@ -304,8 +304,11 @@ $(document).ready(function() {
$(notice_class).remove();
}
- //Clear the data in the forms
- $(the_form).find('input:reset').trigger('click');
+ var submit_type = the_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');
+ }
}
else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");
hooks/post-receive
--
phpMyAdmin