From ee7f2b534ab7ec7abae38d4f9d0ee658709d80db Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Thu, 6 Jun 2019 10:09:35 +0200 Subject: [PATCH] minor refactor --- src/Handler/Corrections.hs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 20182e398..eb053bce9 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -1062,17 +1062,13 @@ assignHandler tid ssh csh rawSids = do -- process form currentRoute <- getCurrentRoute ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm FIDAssignSubmissions buttonForm - assignmentStatus <- case btnResult of - FormSuccess BtnSubmissionsAssign -> do -- Button was pressed, assign and report - -- Assign submissions - runDB $ (\f -> foldM f Map.empty sids) $ - \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing - -- Too much important information for an alert. Display proper info page instead - other -> do - formFailure2Alerts other -- show possible allerts - return Map.empty -- no assignments performed + assignmentStatus <- fmap (fromMaybe Map.empty) . formResultMaybe btnResult $ \BtnSubmissionsAssign -> + -- Assign submissions + fmap Just . runDB $ (\f -> foldM f Map.empty sids) $ + \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing + -- Too much important information for an alert message. Display proper info page instead let btnForm = wrapForm btnWdgt def - { formAction = SomeRoute <$> currentRoute + { formAction = SomeRoute <$> currentRoute -- TODO: should be a modal route , formEncoding = btnEnctype , formSubmit = FormNoSubmit }