From e05104b5ba4be211e8ea5cbe6cf4d285e4ff800d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 6 Aug 2018 11:55:44 +0200 Subject: [PATCH] Fix db.hs --- db.hs | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/db.hs b/db.hs index 6db5f2188..573e87084 100755 --- a/db.hs +++ b/db.hs @@ -48,7 +48,7 @@ main = do fillDb :: DB () fillDb = do - AppSettings{..} <- getsYesod appSettings + AppSettings{ appUserDefaults = UserDefaultConf{..}, .. } <- getsYesod appSettings now <- liftIO getCurrentTime let summer2017 = TermIdentifier 2017 Summer @@ -62,9 +62,10 @@ fillDb = do , userDisplayName = "Gregor Kleen" , userMaxFavourites = 6 , userTheme = Default - , userDateTimeFormat = appDefaultDateTimeFormat - , userDateFormat = appDefaultDateFormat - , userTimeFormat = appDefaultTimeFormat + , userDateTimeFormat = userDefaultDateTimeFormat + , userDateFormat = userDefaultDateFormat + , userTimeFormat = userDefaultTimeFormat + , userDownloadFiles = userDefaultDownloadFiles } fhamann <- insert User { userPlugin = "LDAP" @@ -72,11 +73,12 @@ fillDb = do , userMatrikelnummer = Nothing , userEmail = "felix.hamann@campus.lmu.de" , userDisplayName = "Felix Hamann" - , userMaxFavourites = appDefaultMaxFavourites + , userMaxFavourites = userDefaultMaxFavourites , userTheme = Default - , userDateTimeFormat = appDefaultDateTimeFormat - , userDateFormat = appDefaultDateFormat - , userTimeFormat = appDefaultTimeFormat + , userDateTimeFormat = userDefaultDateTimeFormat + , userDateFormat = userDefaultDateFormat + , userTimeFormat = userDefaultTimeFormat + , userDownloadFiles = userDefaultDownloadFiles } jost <- insert User { userPlugin = "LDAP" @@ -86,9 +88,10 @@ fillDb = do , userDisplayName = "Steffen Jost" , userMaxFavourites = 14 , userTheme = MossGreen - , userDateTimeFormat = appDefaultDateTimeFormat - , userDateFormat = appDefaultDateFormat - , userTimeFormat = appDefaultTimeFormat + , userDateTimeFormat = userDefaultDateTimeFormat + , userDateFormat = userDefaultDateFormat + , userTimeFormat = userDefaultTimeFormat + , userDownloadFiles = userDefaultDownloadFiles } void . insert $ User { userPlugin = "LDAP" @@ -98,9 +101,10 @@ fillDb = do , userDisplayName = "Max Musterstudent" , userMaxFavourites = 7 , userTheme = AberdeenReds - , userDateTimeFormat = appDefaultDateTimeFormat - , userDateFormat = appDefaultDateFormat - , userTimeFormat = appDefaultTimeFormat + , userDateTimeFormat = userDefaultDateTimeFormat + , userDateFormat = userDefaultDateFormat + , userTimeFormat = userDefaultTimeFormat + , userDownloadFiles = userDefaultDownloadFiles } void . insert $ Term { termName = summer2017