bug #5929 Display nullable booleans as null values (javiereguiluz)

This PR was squashed before being merged into the 4.x branch. Discussion ---------- Display nullable booleans as null values This is an alternative to #5924. Commits ------- 626bbaf Display nullable booleans as null values
EasyCorp · Sep 21, 2023 · 6410f44 · 6410f44
2 parents 18af214 + 626bbaf
commit 6410f44
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/assets/css/easyadmin-theme/badges.scss b/assets/css/easyadmin-theme/badges.scss
@@ -61,3 +61,8 @@
   box-shadow: var(--badge-dark-box-shadow);
   color: var(--badge-dark-color);
 }
+.badge.badge-outline {
+  background-color: transparent;
+  box-shadow: var(--badge-outline-box-shadow);
+  color: var(--badge-outline-color);
+}
diff --git a/assets/css/easyadmin-theme/variables-theme.scss b/assets/css/easyadmin-theme/variables-theme.scss
@@ -216,6 +216,8 @@
     --badge-dark-bg: var(--gray-900);
     --badge-dark-box-shadow: none;
     --badge-dark-color: var(--gray-50);
+    --badge-outline-box-shadow: inset 0 0 0 1px var(--gray-300);
+    --badge-outline-color: var(--datalist-value-color);
     --alert-primary-bg: var(--indigo-100);
     --alert-primary-color: var(--indigo-800);
     --alert-primary-border-color: var(--indigo-200);
@@ -531,6 +533,8 @@
     --badge-dark-bg: rgba(0, 0, 0, 0.18);
     --badge-dark-box-shadow: inset 0 0 0 1px rgba(153, 153, 153, 0.3);
     --badge-dark-color: rgb(153, 153, 153);
+    --badge-outline-box-shadow: inset 0 0 0 1px var(--true-gray-500);
+    --badge-outline-color: var(--datalist-value-color);
     --alert-primary-bg: var(--indigo-900);
     --alert-primary-color: var(--indigo-100);
     --alert-primary-border-color: var(--indigo-800);

diff --git a/src/Field/Configurator/CommonPostConfigurator.php b/src/Field/Configurator/CommonPostConfigurator.php
@@ -58,12 +58,11 @@ private function buildFormattedValueOption($value, FieldDto $field, EntityDto $e
     private function updateFieldTemplate(FieldDto $field): void
     {
         $usesEasyAdminTemplate = u($field->getTemplatePath())->startsWith('@EasyAdmin/');
-        $isBooleanField = BooleanField::class === $field->getFieldFqcn();
         $isNullValue = null === $field->getFormattedValue();
         $isEmpty = is_countable($field->getFormattedValue()) && 0 === \count($field->getFormattedValue());
 
         $adminContext = $this->adminContextProvider->getContext();
-        if ($usesEasyAdminTemplate && $isNullValue && !$isBooleanField) {
+        if ($usesEasyAdminTemplate && $isNullValue) {
             $field->setTemplatePath($adminContext->getTemplatePath('label/null'));
         }
 

diff --git a/src/Resources/public/app.8c5cbeb6.css → src/Resources/public/app.fb3c9cb7.css b/src/Resources/public/app.8c5cbeb6.css → src/Resources/public/app.fb3c9cb7.css
diff --git a/src/Resources/public/app.8c5cbeb6.rtl.css → src/Resources/public/app.fb3c9cb7.rtl.css b/src/Resources/public/app.8c5cbeb6.rtl.css → src/Resources/public/app.fb3c9cb7.rtl.css
diff --git a/src/Resources/public/entrypoints.json b/src/Resources/public/entrypoints.json
@@ -2,8 +2,8 @@
   "entrypoints": {
     "app": {
       "css": [
-        "/app.8c5cbeb6.css",
-        "/app.8c5cbeb6.rtl.css"
+        "/app.fb3c9cb7.css",
+        "/app.fb3c9cb7.rtl.css"
       ],
       "js": [
         "/app.914bb6ba.js"

diff --git a/src/Resources/public/manifest.json b/src/Resources/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "app.css": "app.8c5cbeb6.css",
-  "app.rtl.css": "app.8c5cbeb6.rtl.css",
+  "app.css": "app.fb3c9cb7.css",
+  "app.rtl.css": "app.fb3c9cb7.rtl.css",
   "app.js": "app.914bb6ba.js",
   "form.js": "form.fc39362b.js",
   "page-layout.js": "page-layout.3347892e.js",

diff --git a/src/Resources/views/label/null.html.twig b/src/Resources/views/label/null.html.twig
@@ -1,3 +1,3 @@
 {% if not (ea.crud.areNullValuesHidden ?? false) %}
-    <span class="badge badge-secondary">{{ 'label.null'|trans(domain = 'EasyAdminBundle') }}</span>
+    <span class="badge badge-outline">{{ 'label.null'|trans(domain = 'EasyAdminBundle') }}</span>
 {% endif %}