From 07cfc0adcbc80bf41a34880f710bbaf38b36ae28 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 27 Nov 2024 17:12:32 +0100 Subject: [PATCH] fix(hlint): implement some hlint suggestions --- src/Handler/Admin/Avs.hs | 2 +- src/Handler/Utils/Form.hs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Handler/Admin/Avs.hs b/src/Handler/Admin/Avs.hs index bc4489737..57bc37d1a 100644 --- a/src/Handler/Admin/Avs.hs +++ b/src/Handler/Admin/Avs.hs @@ -623,7 +623,7 @@ instance HasUser LicenceTableData where mkLicenceTable :: AvsPersonIdMapPersonCard -> Set AvsPersonId -> Text -> AvsLicence -> Set AvsPersonId -> DB (FormResult (LicenceTableActionData, Set AvsPersonId), Widget) mkLicenceTable apidStatus rsChanged dbtIdent aLic apids = do (currentRoute, usrHasAvsRerr) <- liftHandler $ (,) - <$> (fromMaybe (error "mkLicenceTable called from 404-handler") <$> liftHandler getCurrentRoute) + <$> fmap (fromMaybe $ error "mkLicenceTable called from 404-handler") (liftHandler getCurrentRoute) <*> (messageTooltip <$> messageI Error MsgProblemAvsUsrHadR) avsQualifications <- selectList [QualificationAvsLicence !=. Nothing] [Asc QualificationName] now <- liftIO getCurrentTime diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index 3557b9c54..4d8dae25f 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -669,8 +669,8 @@ uploadModeForm fs prev = multiActionA actions fs (classifyUploadMode <$> prev) actions = Map.fromList [ ( UploadModeNone, pure NoUpload) , ( UploadModeAny - , UploadAny - <$> (fromMaybe False <$> aopt checkBoxField (fslI MsgUploadModeUnpackZips & setTooltip MsgUploadModeUnpackZipsTip) (Just $ prev ^? _Just . _uploadUnpackZips)) + , (UploadAny . fromMaybe False + <$> aopt checkBoxField (fslI MsgUploadModeUnpackZips & setTooltip MsgUploadModeUnpackZipsTip) (Just $ prev ^? _Just . _uploadUnpackZips)) <*> aopt extensionRestrictionField (fslI MsgUploadModeExtensionRestriction & setTooltip MsgUploadModeExtensionRestrictionTip) ((prev ^? _Just . _uploadExtensionRestriction) <|> fmap Just defaultExtensionRestriction) <*> apopt checkBoxField (fslI MsgUploadAnyEmptyOk & setTooltip MsgUploadAnyEmptyOkTip) (preview (_Just . _uploadEmptyOk) prev <|> Just False) ) @@ -792,8 +792,8 @@ examBonusRuleForm prev = multiActionA actions (fslI MsgUtilExamBonusRule) $ clas actions :: Map ExamBonusRule' (AForm Handler ExamBonusRule) actions = Map.fromList [ ( ExamBonusManual' - , ExamBonusManual - <$> (fromMaybe False <$> aopt checkBoxField (fslI MsgExamBonusOnlyPassed) (Just <$> preview _bonusOnlyPassed =<< prev)) + , ExamBonusManual . + fromMaybe False <$> aopt checkBoxField (fslI MsgExamBonusOnlyPassed) (Just <$> preview _bonusOnlyPassed =<< prev) ) , ( ExamBonusPoints' , ExamBonusPoints @@ -2077,7 +2077,7 @@ examPassedGradeField :: forall m. , HandlerSite m ~ UniWorX ) => Field m (Either ExamPassed ExamGrade) -examPassedGradeField = hoistField liftHandler . selectField $ (<>) <$> (fmap Right <$> optionsFinite) <*> (fmap Left <$> optionsFinite) +examPassedGradeField = hoistField liftHandler . selectField $ ((<>) . fmap Right <$> optionsFinite) <*> (fmap Left <$> optionsFinite) examField :: forall m.