nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Errors from the Ajax create table dialog where not displayed

Browse Source
This commit is contained in:
Marc Delisle
2011-02-08 17:36:05 -05:00
parent 677e5a5da7
commit 589d918ee7
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/functions.js
View File

@@ -1743,6 +1743,7 @@ $(document).ready(function() {
//User wants to submit the form //User wants to submit the form
$.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) { $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) {
if(data.success == true) { if(data.success == true) {
$('#properties_message').html('');
PMA_ajaxShowMessage(data.message); PMA_ajaxShowMessage(data.message);
$("#create_table_dialog").dialog("close").remove(); $("#create_table_dialog").dialog("close").remove();
@@ -1794,7 +1795,7 @@ $(document).ready(function() {
} }
} }
else { else {
PMA_ajaxShowMessage(data.error); $('#properties_message').html(data.error);
} }
}) // end $.post() }) // end $.post()
}) // end create table form (save) }) // end create table form (save)

2
libraries/tbl_properties.inc.php
View File

@@ -786,7 +786,7 @@ if ($action == 'tbl_create.php') {
/> />
<?php } ?> <?php } ?>
</fieldset> </fieldset>
<div id="properties_message"></div>
</form> </form>
<div id="enum_editor"> <div id="enum_editor">

16
tbl_create.php
View File

@@ -350,12 +350,16 @@ if (isset($_REQUEST['do_save_data'])) {
} }
exit; exit;
} else { } else {
PMA_mysqlDie('', '', '', $err_url, false); if ($GLOBALS['is_ajax_request'] == true) {
// An error happened while inserting/updating a table definition. PMA_ajaxResponse(PMA_DBI_getError(), false);
// to prevent total loss of that data, we embed the form once again. } else {
// The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php PMA_mysqlDie('', '', '', $err_url, false);
$num_fields = $_REQUEST['orig_num_fields']; // An error happened while inserting/updating a table definition.
$regenerate = true; // to prevent total loss of that data, we embed the form once again.
// The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php
$num_fields = $_REQUEST['orig_num_fields'];
$regenerate = true;
}
} }
} // end do create table } // end do create table