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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-02-16 05:03:54 +01:00
commit 968ae5bb11
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog
- bug Remove extra column heading in view structure page
- bug Add missing confirmation when deleting central columns
- bug Undefined index DisableIS
- bug #4763 Database export with more than 512 tables fails
4.3.9.0 (2015-02-05)
- bug #4728 Incorrect headings in routine editor

7
js/export.js
View File

@ -310,8 +310,15 @@ function createAliasModal(event) {
};
dlgButtons[PMA_messages.strSaveAndClose] = function() {
$(this).dialog("close");
// do not fillup form submission with empty values
$.each($(this).find('input[type="text"]'), function (i, e) {
if ($(e).val().trim().length == 0) {
$(e).prop('disabled', true);
}
});
$('#alias_modal').parent().appendTo($('form[name="dump"]'));
};
$('#alias_modal input[type="text"]').prop('disabled', false);
$('#alias_modal').dialog({
width: Math.min($(window).width() - 100, 700),
modal: true,

5
libraries/display_export.lib.php
View File

@ -803,7 +803,7 @@ function PMA_getHtmlForAliasModalDialog($db = '', $table = '')
}
$db_input_html .= '<input type="text" name="' . $name_attr . '" '
. 'placeholder="' . $db . ' alias" class="' . $class . '" '
. 'id="' . $id_attr . '" value="' . $val . '"/>';
. 'id="' . $id_attr . '" value="' . $val . '" disabled="disabled"/>';
$db_html .= '<option value="' . $id_attr . '">' . $db . '</option>';
$table_html .= '<span id="' . $id_attr . '_tables" class="' . $class . '">';
$table_html .= '<select id="' . $id_attr . '_tables_select" '
@ -827,7 +827,8 @@ function PMA_getHtmlForAliasModalDialog($db = '', $table = '')
}
$table_input_html .= '<input type="text" value="' . $val . '" '
. 'name="' . $name_attr . '" id="' . $id_attr . '" '
. 'placeholder="' . $table . ' alias" class="' . $class . '"/>';
. 'placeholder="' . $table . ' alias" class="' . $class . '" '
. 'disabled="disabled"/>';
$table_html .= '<option value="' . $id_attr . '">'
. $table . '</option>';
$col_html .= '<table id="' . $id_attr . '_cols" class="'