Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit d61a05965028 · 2024-03-29T18:25:45.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -81,6 +81,7 @@ phpMyAdmin - ChangeLog
 - issue #19022 Fix case where tables from wrong database is loaded in navigation tree
 - issue #18593 Fix drop db line included in server export if exporting only data
 - issue #18049 Also check that curl_exec is enabled for the new version check
+- issue #18451 Fix when editing inline central column, Null is always preselected
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/resources/templates/database/central_columns/edit_table_row.twig b/resources/templates/database/central_columns/edit_table_row.twig
@@ -75,11 +75,11 @@
 
   <td class="text-nowrap" name="col_isNull">
     <input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
-      {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
+      {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' and row['col_isNull'] != 0 ? ' checked' }}>
   </td>
 
   <td class="text-nowrap" name="col_extra">
     <input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
-      {{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' }}>
+      {{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' ? ' checked' }}>
   </td>
 </tr>
diff --git a/resources/templates/database/central_columns/main.twig b/resources/templates/database/central_columns/main.twig
@@ -361,7 +361,7 @@
                             <td class="text-nowrap" name="col_isNull">
                                 <span>{{ row['col_isNull'] ? 'Yes'|trans : 'No'|trans }}</span>
                                 <input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
-                                  {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
+                                  {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' and row['col_isNull'] != 0 ? ' checked' }}>
                             </td>
                             <td class="text-nowrap" name="col_extra">
                               <span>{{ row['col_extra'] }}</span>
