From 3e4e3fb4d62e111a43b9830a1150e27ff62a3f78 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 3 Feb 2011 00:51:58 +0530 Subject: [PATCH] Bug # 3170585 [AJAX] Adding more fields fails. --- js/functions.js | 9 ++++++++- tbl_create.php | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 24dc0a3c0..9d9e836b4 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1845,7 +1845,14 @@ $(document).ready(function() { //User wants to add more fields to the table $.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) { - $("#create_table_dialog").html(data); + // if 'create_table_dialog' exists + if ($("#create_table_dialog").length > 0) { + $("#create_table_dialog").html(data); + } + // if 'create_table_div' exists + if ($("#create_table_div").length > 0) { + $("#create_table_div").html(data); + } }) //end $.post() }) // end create table form (add fields) diff --git a/tbl_create.php b/tbl_create.php index 4ba641e41..6d569b50d 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -288,7 +288,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= ''; $new_table_string .= ''. $table . ''; - + if (PMA_Tracker::isActive()) { $truename = str_replace(' ', ' ', htmlspecialchars($table)); if (PMA_Tracker::isTracked($db, $truename)) { @@ -313,7 +313,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= ''; - $new_table_string .= $titles['Drop']; + $new_table_string .= $titles['Drop']; $new_table_string .= '' . "\n"; $new_table_string .= '' . $tbl_stats['Rows'] . '' . "\n"; @@ -362,7 +362,17 @@ if (isset($_REQUEST['do_save_data'])) { /** * Displays the form used to define the structure of the table */ + +// This div is used to show the content(eg: create table form with more columns) fetched with AJAX subsequently. +if($GLOBALS['is_ajax_request'] != true) { + echo('
'); +} + require './libraries/tbl_properties.inc.php'; // Displays the footer require './libraries/footer.inc.php'; + +if($GLOBALS['is_ajax_request'] != true) { + echo('
'); +} ?>