From 503711460f6897fd031ac2835c543a0975dd1827 Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Tue, 25 Sep 2018 15:05:39 +0200 Subject: [PATCH] fix required attribute to be boolean --- src/wanijo/framework/form.clj | 4 ++-- test/wanijo/framework/form_test.clj | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wanijo/framework/form.clj b/src/wanijo/framework/form.clj index be63100..1f25a0a 100644 --- a/src/wanijo/framework/form.clj +++ b/src/wanijo/framework/form.clj @@ -87,7 +87,7 @@ (when (and validate? (not (spec/valid? spec req-value))) (spec-to-errmsg label spec req-value)) (hform/label id label) - (hform/text-field {:required (when required "required")} + (hform/text-field {:required (or required false)} id (if validate? req-value value)))) @@ -109,7 +109,7 @@ (when (and validate? (not (spec/valid? spec req-value))) (spec-to-errmsg label spec value)) (hform/label id label) - (hform/text-area {:required (when required "required")} + (hform/text-area {:required (or required false)} id (if validate? req-value value)))) diff --git a/test/wanijo/framework/form_test.clj b/test/wanijo/framework/form_test.clj index e7e536e..6d93c6e 100644 --- a/test/wanijo/framework/form_test.clj +++ b/test/wanijo/framework/form_test.clj @@ -83,7 +83,7 @@ [:label {:for "foo-id"} "foo-label"] [:input {:id "foo-id" :name "foo-id" - :required nil + :required false :type "text" :value nil}]) (first @@ -97,7 +97,7 @@ [:label {:for "foo-id"} "foo-label"] [:input {:id "foo-id" :name "foo-id" - :required "required" + :required true :type "text" :value nil}]) (first @@ -111,7 +111,7 @@ [:label {:for "foo-id"} "foo-label"] [:input {:id "foo-id" :name "foo-id" - :required "required" + :required true :type "text" :value nil}]) (first @@ -153,7 +153,7 @@ [:label {:for "foo-id"} "foo-label"] [:textarea {:id "foo-id" :name "foo-id" - :required nil} + :required false} ""]) (first (nthrest @@ -166,7 +166,7 @@ [:label {:for "foo-id"} "foo-label"] [:textarea {:id "foo-id" :name "foo-id" - :required "required"} + :required true} ""]) (first (nthrest