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

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2022-10-29 17:20:12 +02:00
commit ea5a541f7b
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
6 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -50,6 +50,9 @@ phpMyAdmin - ChangeLog
- issue #17772 Fix wrong styles for add button from central columns
- issue #17389 Fix HTML disappears when exporting settings to browser's storage
- issue #17166 Fix "Warning: #1287 'X' is deprecated [...] Please use ST_X instead." on search page
- issue Use jquery-migrate.min.js (14KB) instead of jquery-migrate.min.js (31KB)
- issue #17842 Use jquery.validate.min.js (24 KB) instead of jquery.validate.js (50 KB)
- issue #17281 Fix links to databases for information_schema.SCHEMATA
5.2.0 (2022-05-10)
- issue #16521 Upgrade Bootstrap to version 5

5
js/src/database/multi_table_query.js
View File

@ -195,6 +195,11 @@ window.AJAX.registerOnload('database/multi_table_query.js', function () {
$('.criteria_col').each(function () {
$(this).on('change', function () {
var $anchor = $(this).siblings('.jsCriteriaButton').first();
if ($(this).is(':checked') && ! $anchor.hasClass('collapsed')) {
// Do not collapse on checkbox tick as it does not make sense
// The user has it open and wants to tick the box
return;
}
$anchor.trigger('click', ['Trigger']);
});
});

33
libraries/classes/Config/SpecialSchemaLinks.php
View File

@ -64,7 +64,8 @@ class SpecialSchemaLinks
*/
public static function get(): array
{
$defaultPage = './' . Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabTable'], 'table');
$defaultPageDatabase = './' . Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database');
$defaultPageTable = './' . Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabTable'], 'table');
return [
'mysql' => [
@ -87,7 +88,7 @@ class SpecialSchemaLinks
'column_name' => 'Db',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'column_name' => [
'link_param' => 'field',
@ -138,7 +139,7 @@ class SpecialSchemaLinks
'column_name' => 'database_name',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'index_name' => [
'link_param' => 'index',
@ -164,7 +165,7 @@ class SpecialSchemaLinks
'column_name' => 'database_name',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
'proc' => [
@ -254,7 +255,7 @@ class SpecialSchemaLinks
'column_name' => 'Db',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
'user' => [
@ -280,7 +281,7 @@ class SpecialSchemaLinks
'column_name' => 'table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'column_name' => [
'link_param' => 'field',
@ -306,7 +307,7 @@ class SpecialSchemaLinks
'column_name' => 'constraint_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'column_name' => [
'link_param' => 'field',
@ -330,7 +331,7 @@ class SpecialSchemaLinks
'column_name' => 'referenced_table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'referenced_column_name' => [
'link_param' => 'field',
@ -356,7 +357,7 @@ class SpecialSchemaLinks
'column_name' => 'table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
'processlist' => [
@ -380,7 +381,7 @@ class SpecialSchemaLinks
'column_name' => 'constraint_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'referenced_table_name' => [
'link_param' => 'table',
@ -390,7 +391,7 @@ class SpecialSchemaLinks
'column_name' => 'constraint_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
'routines' => [
@ -412,7 +413,7 @@ class SpecialSchemaLinks
'schemata' => [
'schema_name' => [
'link_param' => 'db',
'default_page' => $defaultPage,
'default_page' => $defaultPageDatabase,
],
],
'statistics' => [
@ -424,7 +425,7 @@ class SpecialSchemaLinks
'column_name' => 'table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
'column_name' => [
'link_param' => 'field',
@ -450,7 +451,7 @@ class SpecialSchemaLinks
'column_name' => 'table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
'table_constraints' => [
@ -462,7 +463,7 @@ class SpecialSchemaLinks
'column_name' => 'table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
'views' => [
@ -474,7 +475,7 @@ class SpecialSchemaLinks
'column_name' => 'table_schema',
],
],
'default_page' => $defaultPage,
'default_page' => $defaultPageTable,
],
],
],

2
libraries/classes/Display/Results.php
View File

@ -4184,7 +4184,7 @@ class Results
}
if (isset($map[$meta->name])) {
/** @var array<int, string> $relation */
/** @var array{0: string, 1: string, 2: string|false, 3: string} $relation */
$relation = $map[$meta->name];
// Field to display from the foreign table?
$dispval = '';

4
libraries/classes/Header.php
View File

@ -130,7 +130,7 @@ class Header
{
$this->scripts->addFile('runtime.js');
$this->scripts->addFile('vendor/jquery/jquery.min.js');
$this->scripts->addFile('vendor/jquery/jquery-migrate.js');
$this->scripts->addFile('vendor/jquery/jquery-migrate.min.js');
$this->scripts->addFile('vendor/sprintf.js');
$this->scripts->addFile('ajax.js');
$this->scripts->addFile('keyhandler.js');
@ -138,7 +138,7 @@ class Header
$this->scripts->addFile('name-conflict-fixes.js');
$this->scripts->addFile('vendor/bootstrap/bootstrap.bundle.min.js');
$this->scripts->addFile('vendor/js.cookie.js');
$this->scripts->addFile('vendor/jquery/jquery.validate.js');
$this->scripts->addFile('vendor/jquery/jquery.validate.min.js');
$this->scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
$this->scripts->addFile('menu_resizer.js');
$this->scripts->addFile('cross_framing_protection.js');

7
webpack.config.cjs
View File

@ -133,11 +133,12 @@ module.exports = [
{ from: path.resolve(__dirname, 'node_modules/jquery/dist/jquery.min.js'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery.min.js') },
{ from: path.resolve(__dirname, 'node_modules/jquery/dist/jquery.min.map'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery.min.map') },
{ from: path.resolve(__dirname, 'node_modules/jquery/LICENSE.txt'), to: path.resolve(__dirname, 'js/vendor/jquery/MIT-LICENSE.txt') },
{ from: path.resolve(__dirname, 'node_modules/jquery-migrate/dist/jquery-migrate.js'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery-migrate.js') },
{ from: path.resolve(__dirname, 'node_modules/jquery-migrate/dist/jquery-migrate.min.js'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery-migrate.min.js') },
{ from: path.resolve(__dirname, 'node_modules/jquery-migrate/dist/jquery-migrate.min.map'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery-migrate.min.map') },
{ from: path.resolve(__dirname, 'node_modules/jquery-ui-dist/jquery-ui.min.js'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery-ui.min.js') },
{ from: path.resolve(__dirname, 'node_modules/jquery-validation/dist/jquery.validate.js'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery.validate.js') },
{ from: path.resolve(__dirname, 'node_modules/jquery-validation/dist/jquery.validate.min.js'), to: path.resolve(__dirname, 'js/vendor/jquery/jquery.validate.min.js') },
{ from: path.resolve(__dirname, 'node_modules/jquery-validation/dist/additional-methods.js'), to: path.resolve(__dirname, 'js/vendor/jquery/additional-methods.js') },
{ from: path.resolve(__dirname, 'node_modules/js-cookie/dist/js.cookie.js'), to: path.resolve(__dirname, 'js/vendor/js.cookie.js') },
{ from: path.resolve(__dirname, 'node_modules/js-cookie/dist/js.cookie.min.js'), to: path.resolve(__dirname, 'js/vendor/js.cookie.min.js') },
{ from: path.resolve(__dirname, 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'), to: path.resolve(__dirname, 'js/vendor/bootstrap/bootstrap.bundle.min.js') },
{ from: path.resolve(__dirname, 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map'), to: path.resolve(__dirname, 'js/vendor/bootstrap/bootstrap.bundle.min.js.map') },
{ from: path.resolve(__dirname, 'node_modules/@zxcvbn-ts/core/dist/zxcvbn-ts.js'), to: path.resolve(__dirname, 'js/vendor/zxcvbn-ts.js') },