diff --git a/src/Data/Bool/Instances.hs b/src/Data/Bool/Instances.hs index 699ad1b38..d5eb7a2e0 100644 --- a/src/Data/Bool/Instances.hs +++ b/src/Data/Bool/Instances.hs @@ -22,7 +22,7 @@ instance Csv.FromField Bool where (CI.map Text.strip -> t :: CI Text) <- Csv.parseField f (True <$ guard (isTrue t)) <|> (False <$ guard (isFalse t)) <|> fail "Could not decode Bool" where - isTrue f' = any (== f') + isTrue = flip elem [ "yes", "y", "ja", "j", "wahr", "w", "true", "t", "1" ] - isFalse f' = any (== f') + isFalse = flip elem [ "no", "n", "nein", "falsch", "f", "false", "0" ] diff --git a/src/Handler/Course/Application/Files.hs b/src/Handler/Course/Application/Files.hs index fc42b8e39..31ec53e47 100644 --- a/src/Handler/Course/Application/Files.hs +++ b/src/Handler/Course/Application/Files.hs @@ -96,7 +96,7 @@ getCAppsFilesR tid ssh csh = do E.where_ $ courseApplicationFile E.^. CourseApplicationFileApplication E.==. E.val appId return file - yield $ File + yield File { fileModified = courseApplicationTime , fileTitle = mkAppDir "" , fileContent = Nothing diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs index ae9092732..598c8479b 100644 --- a/src/Import/NoModel.hs +++ b/src/Import/NoModel.hs @@ -72,7 +72,7 @@ import Ldap.Client.Pool as Import import System.Random as Import (Random(..)) import Control.Monad.Random.Class as Import (MonadRandom(..)) -import Control.Monad.Morph as Import (MFunctor(..)) +import Control.Monad.Morph as Import import Control.Monad.Trans.Resource as Import (ReleaseKey) import Jose.Jwt as Import (Jwt) @@ -142,8 +142,6 @@ import Data.Set.Lens as Import import Control.Arrow as Import (Kleisli(..)) -import Control.Monad.Morph as Import - import Control.Monad.Trans.RWS (RWST)