From 0d1fc432129dcc533496249f61b4c20068f36964 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 3 Feb 2017 06:35:23 +1100
Subject: [PATCH] Add isSelected() helper to form field Fixes an issue where
 dropdown NULL and 0 are treated as the same Fixes #2612

---
 modules/backend/classes/FormField.php              | 14 ++++++++++++++
 .../form/partials/_field_balloon-selector.htm      |  2 +-
 .../widgets/form/partials/_field_checkbox.htm      |  2 +-
 .../widgets/form/partials/_field_dropdown.htm      |  4 ++--
 .../backend/widgets/form/partials/_field_radio.htm |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index 36a0dab75..4be372c04 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -351,6 +351,20 @@ class FormField
         return $this;
     }
 
+    /**
+     * Determine if the provided value matches this field's value.
+     * @param string $value
+     * @return bool
+     */
+    public function isSelected($value = true)
+    {
+        if ($this->value === null) {
+            return false;
+        }
+
+        return (string) $value === (string) $this->value;
+    }
+
     /**
      * Sets the attributes for this field in a given position.
      * - field: Attributes are added to the form field element (input, select, textarea, etc)
diff --git a/modules/backend/widgets/form/partials/_field_balloon-selector.htm b/modules/backend/widgets/form/partials/_field_balloon-selector.htm
index 20912519d..ffb725d45 100644
--- a/modules/backend/widgets/form/partials/_field_balloon-selector.htm
+++ b/modules/backend/widgets/form/partials/_field_balloon-selector.htm
@@ -9,7 +9,7 @@
     <?= $field->getAttributes() ?>>
     <ul>
         <?php foreach ($fieldOptions as $value => $text): ?>
-            <li data-value="<?= e($value) ?>" class="<?= $value == $field->value ? 'active' : '' ?>"><?= e(trans($text)) ?></li>
+            <li data-value="<?= e($value) ?>" class="<?= $field->isSelected($value) ? 'active' : '' ?>"><?= e(trans($text)) ?></li>
         <?php endforeach ?>
     </ul>
 
diff --git a/modules/backend/widgets/form/partials/_field_checkbox.htm b/modules/backend/widgets/form/partials/_field_checkbox.htm
index 962501a34..5fdd87766 100644
--- a/modules/backend/widgets/form/partials/_field_checkbox.htm
+++ b/modules/backend/widgets/form/partials/_field_checkbox.htm
@@ -11,7 +11,7 @@
         name="<?= $field->getName() ?>"
         value="1"
         <?= $this->previewMode ? 'disabled="disabled"' : '' ?>
-        <?= $field->value == 1 ? 'checked="checked"' : '' ?>
+        <?= $field->isSelected() ? 'checked="checked"' : '' ?>
         <?= $field->getAttributes() ?>>
 
     <label for="<?= $field->getId() ?>">
diff --git a/modules/backend/widgets/form/partials/_field_dropdown.htm b/modules/backend/widgets/form/partials/_field_dropdown.htm
index 1bfa0711a..6d4dba158 100644
--- a/modules/backend/widgets/form/partials/_field_dropdown.htm
+++ b/modules/backend/widgets/form/partials/_field_dropdown.htm
@@ -22,10 +22,10 @@
                 if (!is_array($option)) $option = [$option];
             ?>
             <option
-                <?= $value == $field->value ? 'selected="selected"' : '' ?>
+                <?= $field->isSelected($value) ? 'selected="selected"' : '' ?>
                 <?php if (isset($option[1])): ?>data-<?=strpos($option[1],'.')?'image':'icon'?>="<?= $option[1] ?>"<?php endif ?>
                 value="<?= $value ?>"
             ><?= e(trans($option[0])) ?></option>
         <?php endforeach ?>
     </select>
-<?php endif?>
+<?php endif ?>
diff --git a/modules/backend/widgets/form/partials/_field_radio.htm b/modules/backend/widgets/form/partials/_field_radio.htm
index 38d866867..2782cf9bd 100644
--- a/modules/backend/widgets/form/partials/_field_radio.htm
+++ b/modules/backend/widgets/form/partials/_field_radio.htm
@@ -19,7 +19,7 @@
                 name="<?= $field->getName() ?>"
                 value="<?= $value ?>"
                 type="radio"
-                <?= $field->value == $value ? 'checked="checked"' : '' ?>
+                <?= $field->isSelected($value) ? 'checked="checked"' : '' ?>
                 <?= $this->previewMode ? 'disabled="disabled"' : '' ?>
                 <?= $field->getAttributes() ?>>