Merge pull request #70 from cweinberger/feature/fix-checkboxgroup

Check for null before checking for bool value
ml-archive · Jun 20, 2018 · c00bf7b · c00bf7b
2 parents 6e92dea + 81e7091
commit c00bf7b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Sources/AdminPanelProvider/Tags/Leaf/CheckboxGroup.swift b/Sources/AdminPanelProvider/Tags/Leaf/CheckboxGroup.swift
@@ -15,7 +15,10 @@ public final class CheckboxGroup: BasicTag {
         }
 
         // Retrieve input value, value from fieldset else passed default value
-        let inputValue = fieldset?["value"]?.bool ?? arguments[1]?.bool ?? false
+        var inputValue = arguments[1]?.bool ?? false
+        if let fieldsetValue = fieldset?["value"], fieldsetValue.isNull == false {
+            inputValue = fieldsetValue.bool ?? false
+        }
 
         let label = fieldset?["label"]?.string ?? fieldsetPath