Merge pull request #1428 from bolt/fix/allow-comparison-for-scalar-fi…

…elds

Allow comparison for scalar fields

config/bolt/contenttypes.yaml

@@ -220,7 +220,7 @@ showcases:
         integerfield:
             type: number
             mode: integer
-            step: 0.25
+            step: 1
         floatfield:
             type: number
             mode: float
@@ -415,8 +415,7 @@ tests:
 # Possible field types:
 #
 # text - varchar(256) - input type text.
-# integer - integer - Input field for integer numbers.
-# float - double - Input field for floating numbers, stored as 'Double'.
+# number - double - Input field for numbers, with `mode: integer` or `mode: float`
 # imagelist - text (65kb) - Input type for imagelists. Add multiple images. Useful for image sliders, galleries, etcetera.
 # image - varchar(256) - image select/upload widget, stored as filename.
 # file - varchar(256) - file select/upload widget, stored as filename.

src/Entity/Content.php

@@ -10,6 +10,7 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;
 use Bolt\Configuration\Content\ContentType;
 use Bolt\Entity\Field\Excerptable;
+use Bolt\Entity\Field\ScalarCastable;
 use Bolt\Enum\Statuses;
 use Bolt\Repository\FieldRepository;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -640,7 +641,7 @@ public function __call(string $name, array $arguments = [])
             throw new \RuntimeException(sprintf('Invalid field name or method call on %s: %s', $this->__toString(), $name));
         }
 
-        if ($field instanceof Excerptable) {
+        if ($field instanceof Excerptable || $field instanceof ScalarCastable) {
             return $field->getTwigValue();
         }
 

src/Entity/Field/CheckboxField.php

@@ -11,7 +11,12 @@
 /**
  * @ORM\Entity
  */
-class CheckboxField extends Field implements FieldInterface
+class CheckboxField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'checkbox';
+
+    public function getTwigValue()
+    {
+        return current($this->getValue());
+    }
 }

src/Entity/Field/DateField.php

@@ -11,7 +11,7 @@
 /**
  * @ORM\Entity
  */
-class DateField extends Field implements FieldInterface
+class DateField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'date';
 

src/Entity/Field/EmailField.php

@@ -11,7 +11,7 @@
 /**
  * @ORM\Entity
  */
-class EmailField extends Field implements FieldInterface
+class EmailField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'email';
 }

src/Entity/Field/HiddenField.php

@@ -12,7 +12,7 @@
 /**
  * @ORM\Entity
  */
-class HiddenField extends Field implements FieldInterface
+class HiddenField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'hidden';
 

src/Entity/Field/NumberField.php

@@ -11,7 +11,7 @@
 /**
  * @ORM\Entity
  */
-class NumberField extends Field implements FieldInterface
+class NumberField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'number';
 }

src/Entity/Field/ScalarCastable.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bolt\Entity\Field;
+
+/**
+ * Field that can be cast to a plain scalar value (string, int, boolean, float)  in excerpt must implement this interface
+ */
+interface ScalarCastable
+{
+}

src/Entity/Field/SlugField.php

@@ -13,7 +13,7 @@
 /**
  * @ORM\Entity
  */
-class SlugField extends Field implements FieldInterface
+class SlugField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'slug';
 

templates/helpers/_field_blocks.twig

@@ -78,7 +78,7 @@
 
     {# Checkbox fields #}
     {% if type == "checkbox" %}
-        <p><strong>{{ field|label }}</strong>: {{ field ? "checked" : "not checked" }}</p>
+        <p><strong>{{ field|label }}</strong>: {% if field.twigValue %} checked {% else %} not checked {% endif %}</p>
     {% endif %}
 
     {# Embed fields #}