Simplify code, fix linter warnings

This commit is contained in:
Jakob Schöttl 2021-04-14 09:40:21 +02:00
parent 848da5ff12
commit e3a95bd92c
2 changed files with 6 additions and 6 deletions

View File

@ -3,7 +3,7 @@
Form handling for Yesod, in the same style as formlets. See [the forms Form handling for Yesod, in the same style as formlets. See [the forms
chapter](http://www.yesodweb.com/book/forms) of the Yesod book. chapter](http://www.yesodweb.com/book/forms) of the Yesod book.
This package provies a set of basic form inputs such as text, number, time, This package provides a set of basic form inputs such as text, number, time,
checkbox, select, textarea, and etc. via `Yesod.Form.Fields` module. Also, checkbox, select, textarea, and etc. via `Yesod.Form.Fields` module. Also,
there is `Yesod.Form.Nic` module providing richtext field using Nic editor. there is `Yesod.Form.Nic` module providing richtext field using Nic editor.
However, this module is grandfathered now and Nic editor is not actively However, this module is grandfathered now and Nic editor is not actively

View File

@ -813,11 +813,11 @@ selectFieldHelper outside onOpt inside grpHdr opts' = Field
, fieldView = \theId name attrs val isReq -> do , fieldView = \theId name attrs val isReq -> do
outside theId name attrs $ do outside theId name attrs $ do
optsFlat <- fmap (olOptions.flattenOptionList) $ handlerToWidget opts' optsFlat <- fmap (olOptions.flattenOptionList) $ handlerToWidget opts'
unless isReq $ onOpt theId name $ not $ render optsFlat val `elem` map optionExternalValue optsFlat unless isReq $ onOpt theId name $ render optsFlat val `notElem` map optionExternalValue optsFlat
opts'' <- handlerToWidget opts' opts'' <- handlerToWidget opts'
case opts'' of case opts'' of
(OptionList{}) -> constructOptions theId name attrs val isReq optsFlat OptionList{} -> constructOptions theId name attrs val isReq optsFlat
(OptionListGrouped{olOptionsGrouped=grps}) -> do OptionListGrouped{olOptionsGrouped=grps} -> do
forM_ grps $ \(grp, opts) -> do forM_ grps $ \(grp, opts) -> do
case grpHdr of case grpHdr of
Just hdr -> hdr grp Just hdr -> hdr grp
@ -841,7 +841,7 @@ selectFieldHelper outside onOpt inside grpHdr opts' = Field
name name
((if isReq then (("required", "required"):) else id) attrs) ((if isReq then (("required", "required"):) else id) attrs)
(optionExternalValue opt) (optionExternalValue opt)
((render opts val) == optionExternalValue opt) (render opts val == optionExternalValue opt)
(optionDisplay opt) (optionDisplay opt)
-- | Creates an input with @type="file"@. -- | Creates an input with @type="file"@.
@ -939,7 +939,7 @@ prependZero t0 = if T.null t1
then "-0." `T.append` (T.drop 2 t1) then "-0." `T.append` (T.drop 2 t1)
else t1 else t1
where t1 = T.dropWhile ((==) ' ') t0 where t1 = T.dropWhile (==' ') t0
-- $optionsOverview -- $optionsOverview
-- These functions create inputs where one or more options can be selected from a list. -- These functions create inputs where one or more options can be selected from a list.