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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2011-02-09 00:40:05 +01:00
parent 459982abaa 27e98f4532
commit 709d7453be
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/functions.js
View File

@@ -1556,7 +1556,7 @@ function PMA_ajaxShowMessage(message, timeout) {
/** /**
* Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected
*/ */
function toggle_enum_notice(selectElement) { function showNoticeForEnum(selectElement) {
var enum_notice_id = selectElement.attr("id").split("_")[1]; var enum_notice_id = selectElement.attr("id").split("_")[1];
enum_notice_id += "_" + (parseInt(selectElement.attr("id").split("_")[2]) + 1); enum_notice_id += "_" + (parseInt(selectElement.attr("id").split("_")[2]) + 1);
var selectedType = selectElement.attr("value"); var selectedType = selectElement.attr("value");
@@ -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)
@@ -2040,13 +2041,13 @@ $(document).ready(function() {
// //
// needs live() to work also in the Create Table dialog // needs live() to work also in the Create Table dialog
$("select[class='column_type']").live('change', function() { $("select[class='column_type']").live('change', function() {
toggle_enum_notice($(this)); showNoticeForEnum($(this));
}); });
}); });
function PMA_verifyTypeOfAllColumns() { function PMA_verifyTypeOfAllColumns() {
$("select[class='column_type']").each(function() { $("select[class='column_type']").each(function() {
toggle_enum_notice($(this)); showNoticeForEnum($(this));
}); });
} }

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

7
themes/darkblue_orange/css/theme_right.css.php
View File

@@ -15,7 +15,8 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (
isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '82%'));?>;
} }
input, select, textarea { input, select, textarea {
@@ -1360,6 +1361,10 @@ code.sql, div.sqlvalidate {
width: 98%; width: 98%;
} }
textarea#partitiondefinition {
height:3em;
}
/* for elements that should be revealed only via js */ /* for elements that should be revealed only via js */
.hide { .hide {
display: none; display: none;

5
themes/original/css/theme_right.css.php
View File

@@ -1312,6 +1312,11 @@ code.sql, div.sqlvalidate {
width: 98%; width: 98%;
} }
textarea#partitiondefinition {
height:3em;
}
/* for elements that should be revealed only via js */ /* for elements that should be revealed only via js */
.hide { .hide {
display: none; display: none;