Conditional Ajax for other db operations

This commit is contained in:
Marc Delisle
2011-01-29 10:32:56 -05:00
parent 21fd381c84
commit 3c573fc82e
2 changed files with 20 additions and 8 deletions

View File

@@ -458,7 +458,7 @@ echo __('Remove database');
* Copy database * Copy database
*/ */
?> ?>
<form id="copy_db_form" method="post" action="db_operations.php" <form id="copy_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php"
onsubmit="return emptyFormElements(this, 'newname')"> onsubmit="return emptyFormElements(this, 'newname')">
<?php <?php
if (isset($db_collation)) { if (isset($db_collation)) {
@@ -528,7 +528,11 @@ echo __('Remove database');
/** /**
* Change database charset * Change database charset
*/ */
echo '<form id="change_db_charset_form" method="post" action="./db_operations.php">' . "\n" echo '<form id="change_db_charset_form" ';
if ($GLOBALS['cfg']['AjaxEnable']) {
echo ' class="ajax" ';
}
echo 'method="post" action="./db_operations.php">'
. PMA_generate_common_hidden_inputs($db, $table) . PMA_generate_common_hidden_inputs($db, $table)
. '<fieldset>' . "\n" . '<fieldset>' . "\n"
. ' <legend>'; . ' <legend>';

View File

@@ -30,7 +30,7 @@ $(document).ready(function() {
$("#rename_db_form.ajax").live('submit', function(event) { $("#rename_db_form.ajax").live('submit', function(event) {
event.preventDefault(); event.preventDefault();
$form = $(this); var $form = $(this);
var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db;
@@ -86,12 +86,15 @@ $(document).ready(function() {
* Ajax Event Handler for 'Copy Database' * Ajax Event Handler for 'Copy Database'
* *
* @uses PMA_ajaxShowMessage() * @uses PMA_ajaxShowMessage()
* @see $cfg['AjaxEnable']
*/ */
$("#copy_db_form").live('submit', function(event) { $("#copy_db_form.ajax").live('submit', function(event) {
event.preventDefault(); event.preventDefault();
PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']);
$form = $(this);
var $form = $(this);
if (! $form.find('input:hidden').is('#ajax_request_hidden')) { if (! $form.find('input:hidden').is('#ajax_request_hidden')) {
$form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />');
} }
@@ -123,15 +126,20 @@ $(document).ready(function() {
* Ajax Event handler for 'Change Charset' of the database * Ajax Event handler for 'Change Charset' of the database
* *
* @uses PMA_ajaxShowMessage() * @uses PMA_ajaxShowMessage()
* @see $cfg['AjaxEnable']
*/ */
$("#change_db_charset_form").live('submit', function(event) { $("#change_db_charset_form.ajax").live('submit', function(event) {
event.preventDefault(); event.preventDefault();
$(this).append('<input type="hidden" name="ajax_request" value="true" />'); var $form = $(this);
if (! $form.find('input:hidden').is('#ajax_request_hidden')) {
$form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />');
}
PMA_ajaxShowMessage(PMA_messages['strChangingCharset']); PMA_ajaxShowMessage(PMA_messages['strChangingCharset']);
$.get($(this).attr('action'), $(this).serialize() + "&submitcollation=" + $(this).find("input[name=submitcollation]").attr('value'), function(data) { $.get($form.attr('action'), $form.serialize() + "&submitcollation=" + $form.find("input[name=submitcollation]").attr('value'), function(data) {
if(data.success == true) { if(data.success == true) {
PMA_ajaxShowMessage(data.message); PMA_ajaxShowMessage(data.message);
} }