diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 74a7cf051..ace4a2427 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -27,13 +27,13 @@ data SettingsForm = SettingsForm makeSettingForm :: Maybe SettingsForm -> Form SettingsForm makeSettingForm template = identForm FIDsettings $ \html -> do let themeList = [(display t,t) | t <- allThemes] - flip (renderAForm FormStandard) html $ SettingsForm + (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm <$> areq (natField "Favoriten") -- TODO: natFieldI not working here - (fslpI MsgFavoriten "12") (stgMaxFavourties <$> template) + (fslpI MsgFavoriten "Anzahl Favoriten") (stgMaxFavourties <$> template) <*> areq (selectFieldList themeList) (fslI MsgTheme ) (stgTheme <$> template) <* submitButton - -- no validation required here + return (result, widget) -- no validation required here @@ -47,10 +47,9 @@ getProfileR = do ((res,formWidget), formEnctype) <- runFormPost $ makeSettingForm settingsTemplate case res of (FormSuccess SettingsForm{..}) -> do - runDB $ update uid [ UserMaxFavourites =. userMaxFavourites - , UserTheme =. userTheme + runDB $ update uid [ UserMaxFavourites =. stgMaxFavourties + , UserTheme =. stgTheme ] - addMessage "info" $ toHtml $ "LOG:" ++ display userMaxFavourites ++ display userTheme addMessageI "info" $ MsgSettingsUpdate (FormFailure msgs) -> forM_ msgs $ (addMessage "warning") . toHtml _ -> return () diff --git a/src/Model/Types.hs b/src/Model/Types.hs index 97b5689e1..bab4a2439 100644 --- a/src/Model/Types.hs +++ b/src/Model/Types.hs @@ -209,7 +209,7 @@ derivePersistField "StudyFieldType" data Theme --Simply add Themes to this type only. CamelCase will be converted to "-lower" = Default | NeutralBlue - | AberdeenRedso + | AberdeenReds | MintGreen | SkyLove deriving (Eq,Ord,Bounded,Enum)