From ac5e1b6f4bf4229fd012e694f11acd84dd5c497c Mon Sep 17 00:00:00 2001 From: SJost Date: Wed, 27 Jun 2018 10:00:23 +0200 Subject: [PATCH] Keter Deploy 27.07.18 --- messages/de.msg | 3 ++- src/Handler/Profile.hs | 3 ++- src/Handler/Utils/Form.hs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/messages/de.msg b/messages/de.msg index c007a0a72..07b667282 100644 --- a/messages/de.msg +++ b/messages/de.msg @@ -1,4 +1,4 @@ - SummerTerm year@Integer: Sommersemester #{tshow year} +SummerTerm year@Integer: Sommersemester #{tshow year} WinterTerm year@Integer: Wintersemester #{tshow year}/#{tshow $ succ year} PSLimitNonPositive: “pagesize” muss größer als null sein Page n@Int64: #{tshow n} @@ -86,3 +86,4 @@ SheetSolution: Lösung SheetMarking: Korrekturhinweise MultiFileUploadInfo: (Mehrere Dateien mit Shift oder Strg auswählen) +NatField xyz@Text: #{xyz} muss eine natürliche Zahl sein! diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 696915f6c..c21527b77 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -28,7 +28,7 @@ makeSettingForm :: Maybe SettingsForm -> Form SettingsForm makeSettingForm template = identForm FIDsettings $ \html -> do let themeList = [(display t,t) | t <- allThemes] (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm - <$> areq (natField "Favoriten") -- TODO: natFieldI not working here + <$> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template) <*> areq (selectFieldList themeList) (fslI MsgTheme ) (stgTheme <$> template) @@ -59,6 +59,7 @@ getProfileR = do ] mapM_ delete oldFavs addMessageI "info" $ MsgSettingsUpdate + redirect ProfileR -- TODO: them change does not happen without redirect (FormFailure msgs) -> forM_ msgs $ (addMessage "warning") . toHtml _ -> return () diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index 63d5c4bd2..6b87666e5 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -227,7 +227,7 @@ buttonForm csrf = do ------------ -natFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => FormMessage -> Field m i +natFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) msg, RenderMessage (HandlerSite m) FormMessage) => msg -> Field m i natFieldI msg = checkBool (>= 0) msg intField natField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i