Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2024-08-16 18:10:05 -03:00
commit 7d1ddd22a5
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
7 changed files with 32 additions and 5 deletions

View File

@ -16,8 +16,8 @@ Code status
:alt: End-to-End tests
:target: https://github.com/phpmyadmin/phpmyadmin/actions/workflows/test-selenium.yml?query=branch%3Amaster
.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=latest
:target: https://docs.phpmyadmin.net/en/latest/
.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=master
:target: https://docs.phpmyadmin.net/en/master/
:alt: Documentation build status
.. image:: https://hosted.weblate.org/widgets/phpmyadmin/-/master/svg-badge.svg
@ -40,7 +40,7 @@ Code status
:alt: Type coverage
:target: https://shepherd.dev/github/phpmyadmin/phpmyadmin
.. image:: https://badge.stryker-mutator.io/github.com/phpmyadmin/phpmyadmin/master
.. image:: https://img.shields.io/endpoint?url=https://badge-api.stryker-mutator.io/github.com/phpmyadmin/phpmyadmin/master
:alt: Infection MSI
:target: https://infection.github.io

View File

@ -1,3 +1,12 @@
.table {
th,
td {
> span:empty::before {
content: "\200b";
}
}
}
@media only screen and (width >= 768px) {
.table th.position-sticky {
top: 96px;

View File

@ -17,6 +17,13 @@
}
}
th,
td {
> span:empty::before {
content: "\200b";
}
}
caption {
font-family: $font-family-bold;
background-color: $th-background;

View File

@ -11,6 +11,13 @@
background-color: $th-background;
}
th,
td {
> span:empty::before {
content: "\200b";
}
}
thead th {
border-bottom: 0;
}

View File

@ -5,6 +5,10 @@
td {
text-shadow: 0 1px 0 #fff;
vertical-align: middle;
> span:empty::before {
content: "\200b";
}
}
th {

View File

@ -1604,7 +1604,7 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine
isValueUpdated = thisFieldParams[fieldName] !== getCellValue(g.currentEditCell);
} else {
const JSONString = stringifyJSON(thisFieldParams[fieldName]);
isValueUpdated = JSONString !== JSON.stringify(JSON.parse(getCellValue(g.currentEditCell)));
isValueUpdated = JSONString !== stringifyJSON(getCellValue(g.currentEditCell));
}
if (g.wasEditedCellNull || isValueUpdated) {

View File

@ -3123,7 +3123,7 @@ class Results
// 2.1 Prepares a messages with position information
$sqlQueryMessage = '';
if ($displayParts->hasQueryStats) {
if ($displayParts->hasQueryStats && $total > 0) {
$message = $this->setMessageInformation(
$sortedColumnMessage,
$statementInfo,