Skip to content

Commit

Permalink
Merge branch 'QA_5_1'
Browse files Browse the repository at this point in the history
Signed-off-by: William Desportes <williamdes@wdes.fr>
  • Loading branch information
williamdes committed Aug 9, 2021
2 parents f970299 + ce3176f commit e74ac3c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Expand Up @@ -92,6 +92,10 @@ phpMyAdmin - ChangeLog
- issue #11834 Fixed adding a new user on "privileges" tab of a table with a database name using a "_" character
- issue #17033 Fixed scaling of line width and point size in GIS visualization
- issue #17054 Removed "DEL" character from generated random strings for Blowfish secret auto-generated by setup
- issue #17019 Fixed "Browse" button visible when creating a table from the database structure view
- issue #16804 Fixed numbers where left-aligned rather than right-aligned
- issue Fixed Metro theme text color for buttons in the browse table navigation bar
- issue #14796 Fix export Database page, UI prevents from exporting procedures only

5.1.1 (2021-06-04)
- issue #13325 Fixed created procedure shows up in triggers and events and vice-versa
Expand Down
8 changes: 0 additions & 8 deletions js/src/export.js
Expand Up @@ -495,19 +495,11 @@ Export.checkTableSelectAll = function () {
};

Export.checkTableSelectStructureOrData = function () {
var strChecked = $('input[name="table_structure[]"]:checked').length;
var dataChecked = $('input[name="table_data[]"]:checked').length;
var autoIncrement = $('#checkbox_sql_auto_increment');

var pluginName = $('select#plugins').val();
var dataDiv = '#' + pluginName + '_data';
var structureDiv = '#' + pluginName + '_structure';

if (strChecked === 0) {
$(structureDiv).slideUp('slow');
} else {
$(structureDiv).slideDown('slow');
}

if (dataChecked === 0) {
$(dataDiv).slideUp('slow');
Expand Down
4 changes: 2 additions & 2 deletions libraries/classes/Controllers/Table/CreateController.php
Expand Up @@ -171,8 +171,8 @@ public function index(): void
return;
}

// This global variable needs to be reset for the header class to function properly
$table = '';
// Do not display the table in the header since it hasn't been created yet
$this->response->getHeader()->getMenu()->setTable('');

$this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js', 'indexes.js']);

Expand Down
1 change: 1 addition & 0 deletions themes/metro/scss/_common.scss
Expand Up @@ -2036,6 +2036,7 @@ form.append_fields_form .tblFooters {
input {
&[type="submit"] {
background: $navi-background;
color: $navi-color;
border: none;
filter: none;
margin: 5px;
Expand Down

0 comments on commit e74ac3c

Please sign in to comment.