From 4781c703bb8a348067a9be602bff29766bfd7929 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 25 Jul 2015 09:22:22 +1000
Subject: [PATCH] Fixes previewMode on checkboxlist and radio Checkboxlist
 wasn't showing the placeholder for empty preview values

---
 .../form/partials/_field_checkboxlist.htm     | 145 +++++++++---------
 .../widgets/form/partials/_field_radio.htm    |   1 +
 2 files changed, 72 insertions(+), 74 deletions(-)

diff --git a/modules/backend/widgets/form/partials/_field_checkboxlist.htm b/modules/backend/widgets/form/partials/_field_checkboxlist.htm
index 9c2447214..78508b84e 100644
--- a/modules/backend/widgets/form/partials/_field_checkboxlist.htm
+++ b/modules/backend/widgets/form/partials/_field_checkboxlist.htm
@@ -1,87 +1,84 @@
 <?php
     $fieldOptions = $field->options();
-    $checkedValues = (is_array($field->value)) ? $field->value : [$field->value];
+    $checkedValues = (array) $field->value;
 ?>
 <!-- Checkbox List -->
-<?php if (count($fieldOptions)): ?>
+<?php if ($this->previewMode && $field->value): ?>
 
     <div class="field-checkboxlist">
+        <?php $index = 0; foreach ($fieldOptions as $value => $option): ?>
+            <?php
+                $index++;
+                $checkboxId = 'checkbox_'.$field->getId().'_'.$index;
+                if (!in_array($value, $checkedValues)) continue;
+                if (is_string($option)) $option = [$option];
+            ?>
+            <div class="checkbox custom-checkbox">
+                <input
+                    type="checkbox"
+                    id="<?= $checkboxId ?>"
+                    name="<?= $field->getName() ?>[]"
+                    value="<?= $value ?>"
+                    disabled="disabled"
+                    checked="checked">
 
-        <?php if ($this->previewMode): ?>
+                <label for="<?= $checkboxId ?>">
+                    <?= e(trans($option[0])) ?>
+                </label>
+                <?php if (isset($option[1])): ?>
+                    <p class="help-block"><?= e(trans($option[1])) ?></p>
+                <?php endif ?>
+            </div>
+        <?php endforeach ?>
+    </div>
 
-            <?php $index = 0; foreach ($fieldOptions as $value => $option): ?>
-                <?php
-                    $index++;
-                    $checkboxId = 'checkbox_'.$field->getId().'_'.$index;
-                    if (!in_array($value, $checkedValues)) continue;
-                    if (is_string($option)) $option = [$option];
-                ?>
-                <div class="checkbox custom-checkbox">
-                    <input
-                        type="checkbox"
-                        id="<?= $checkboxId ?>"
-                        name="<?= $field->getName() ?>[]"
-                        value="<?= $value ?>"
-                        disabled="disabled"
-                        checked="checked">
+<?php elseif (!$this->previewMode && count($fieldOptions)): ?>
 
-                    <label for="<?= $checkboxId ?>">
-                        <?= e(trans($option[0])) ?>
-                    </label>
-                    <?php if (isset($option[1])): ?>
-                        <p class="help-block"><?= e(trans($option[1])) ?></p>
-                    <?php endif ?>
+    <div class="field-checkboxlist">
+        <?php if (count($fieldOptions) > 10): ?>
+            <!-- Quick selection -->
+            <small>
+                <?= e(trans('backend::lang.form.select')) ?>:
+                <a href="javascript:;" data-field-checkboxlist-all><?= e(trans('backend::lang.form.select_all')) ?></a>,
+                <a href="javascript:;" data-field-checkboxlist-none><?= e(trans('backend::lang.form.select_none')) ?></a>
+            </small>
+
+            <!-- Scrollable Checkbox list -->
+            <div class="field-checkboxlist-scrollable">
+                <div class="control-scrollbar" data-control="scrollbar">
+        <?php endif ?>
+
+        <input
+            type="hidden"
+            name="<?= $field->getName() ?>"
+            value="0" />
+
+        <?php $index = 0; foreach ($fieldOptions as $value => $option): ?>
+            <?php
+                $index++;
+                $checkboxId = 'checkbox_'.$field->getId().'_'.$index;
+                if (is_string($option)) $option = [$option];
+            ?>
+            <div class="checkbox custom-checkbox">
+                <input
+                    type="checkbox"
+                    id="<?= $checkboxId ?>"
+                    name="<?= $field->getName() ?>[]"
+                    value="<?= $value ?>"
+                    <?= in_array($value, $checkedValues) ? 'checked="checked"' : '' ?>>
+
+                <label for="<?= $checkboxId ?>">
+                    <?= e(trans($option[0])) ?>
+                </label>
+                <?php if (isset($option[1])): ?>
+                    <p class="help-block"><?= e(trans($option[1])) ?></p>
+                <?php endif ?>
+            </div>
+        <?php endforeach ?>
+
+        <?php if (count($fieldOptions) > 10): ?>
                 </div>
-            <?php endforeach ?>
-
-        <?php else: ?>
-
-            <?php if (count($fieldOptions) > 10): ?>
-                <!-- Quick selection -->
-                <small>
-                    <?= e(trans('backend::lang.form.select')) ?>:
-                    <a href="javascript:;" data-field-checkboxlist-all><?= e(trans('backend::lang.form.select_all')) ?></a>,
-                    <a href="javascript:;" data-field-checkboxlist-none><?= e(trans('backend::lang.form.select_none')) ?></a>
-                </small>
-
-                <!-- Scrollable Checkbox list -->
-                <div class="field-checkboxlist-scrollable">
-                    <div class="control-scrollbar" data-control="scrollbar">
-            <?php endif ?>
-
-            <input
-                type="hidden"
-                name="<?= $field->getName() ?>"
-                value="0" />
-
-            <?php $index = 0; foreach ($fieldOptions as $value => $option): ?>
-                <?php
-                    $index++;
-                    $checkboxId = 'checkbox_'.$field->getId().'_'.$index;
-                    if (is_string($option)) $option = [$option];
-                ?>
-                <div class="checkbox custom-checkbox">
-                    <input
-                        type="checkbox"
-                        id="<?= $checkboxId ?>"
-                        name="<?= $field->getName() ?>[]"
-                        value="<?= $value ?>"
-                        <?= in_array($value, $checkedValues) ? 'checked="checked"' : '' ?>>
-
-                    <label for="<?= $checkboxId ?>">
-                        <?= e(trans($option[0])) ?>
-                    </label>
-                    <?php if (isset($option[1])): ?>
-                        <p class="help-block"><?= e(trans($option[1])) ?></p>
-                    <?php endif ?>
-                </div>
-            <?php endforeach ?>
-
-            <?php if (count($fieldOptions) > 10): ?>
-                    </div>
-                </div>
-            <?php endif ?>
-
+            </div>
         <?php endif ?>
 
     </div>
diff --git a/modules/backend/widgets/form/partials/_field_radio.htm b/modules/backend/widgets/form/partials/_field_radio.htm
index f0ad23b32..38d866867 100644
--- a/modules/backend/widgets/form/partials/_field_radio.htm
+++ b/modules/backend/widgets/form/partials/_field_radio.htm
@@ -20,6 +20,7 @@
                 value="<?= $value ?>"
                 type="radio"
                 <?= $field->value == $value ? 'checked="checked"' : '' ?>
+                <?= $this->previewMode ? 'disabled="disabled"' : '' ?>
                 <?= $field->getAttributes() ?>>
 
             <label for="<?= $fieldId ?>">