Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 2381e48e1c93 · 2023-07-05T21:07:35.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
 - issue #18403 Fix Uncaught SyntaxError: JSON.parse on makegrid conditions
 - issue #17528 Fix double escaping of database group names in the navigation tree
 - issue #18473 Fix the NULL not applied after clearing nullable field
+- issue #18454 Fix date field calendar display when changing NULL state
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/js/src/makegrid.ts b/js/src/makegrid.ts
@@ -929,6 +929,8 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine
                             if ($editArea.find('select').length > 0) {
                                 $editArea.find('select').val('');
                             }
+                        } else if ($td.is('.datefield')) {
+                            $('.ui-datepicker-trigger').trigger('click');
                         } else {
                             $editArea.find('textarea').val('');
                         }

Original file line number	Diff line number	Diff line change
`@@ -929,6 +929,8 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine`
`929`	`929`	`if ($editArea.find('select').length > 0) {`
`930`	`930`	`$editArea.find('select').val('');`
`931`	`931`	`}`
	`932`	`+ } else if ($td.is('.datefield')) {`
	`933`	`+ $('.ui-datepicker-trigger').trigger('click');`
`932`	`934`	`} else {`
`933`	`935`	`$editArea.find('textarea').val('');`
`934`	`936`	`}`