table structure: Do not send #topmenucontainer in ajax requests

This commit is contained in:
Rouslan Placella 2011-10-31 13:37:43 +00:00
parent 93ab45ced3
commit f607d8a93c
3 changed files with 6 additions and 10 deletions

View File

@ -366,10 +366,7 @@ $(document).ready(function() {
open: PMA_verifyColumnsProperties,
modal: true,
buttons : button_options
})
//Remove the top menu container from the dialog
.find("#topmenucontainer").hide()
; // end dialog options
}); // end dialog options
$div = $("#add_columns");
/*changed the z-index of the enum editor to allow the edit*/
@ -435,10 +432,7 @@ function changeColumns(action,url)
modal: true,
open: PMA_verifyColumnsProperties,
buttons : button_options
})
//Remove the top menu container from the dialog
.find("#topmenucontainer").hide()
; // end dialog options
}); // end dialog options
$("#append_fields_form input[name=do_save_data]").addClass("ajax");
/*changed the z-index of the enum editor to allow the edit*/
$("#enum_editor").css("z-index", "1100");

View File

@ -156,7 +156,9 @@ if (isset($_REQUEST['do_save_data'])) {
* $selected comes from multi_submits.inc.php
*/
if ($abort == false) {
include_once './libraries/tbl_links.inc.php';
if ($_REQUEST['ajax_request'] != true) {
include_once './libraries/tbl_links.inc.php';
}
if (! isset($selected)) {
PMA_checkParameters(array('field'));

View File

@ -124,7 +124,7 @@ if (isset($_REQUEST['do_save_data'])) {
// Displays headers (if needed)
$GLOBALS['js_include'][] = 'indexes.js';
require_once './libraries/tbl_info.inc.php';
if ( $GLOBALS['is_ajax_request'] != true) {
if ($GLOBALS['is_ajax_request'] != true) {
require_once './libraries/tbl_links.inc.php';
}