From 1929c5cace94c02460efec4824adaaeec103fc87 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 20 Mar 2019 18:44:58 +0100 Subject: [PATCH] Fix build --- src/Handler/Course.hs | 8 ++++---- src/Handler/Utils/Form.hs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 838f81fe7..bf779d136 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -734,19 +734,19 @@ colUserSemester = sortable (Just "semesternr") (i18nCell MsgStudyFeatureAge) $ colUserField :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) colUserField = sortable (Just "field") (i18nCell MsgCourseStudyFeature) $ - foldMap htmlCell . view (_userTableFeatures . _3) + foldMap i18nCell . view (_userTableFeatures . _3) colUserFieldShort :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) colUserFieldShort = sortable (Just "field-short") (i18nCell MsgCourseStudyFeature) $ - foldMap (htmlCell . shortStudyTerms) . view (_userTableFeatures . _3) + foldMap (i18nCell . ShortStudyTerms) . view (_userTableFeatures . _3) colUserDegree :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) colUserDegree = sortable (Just "degree") (i18nCell MsgStudyFeatureDegree) $ - foldMap htmlCell . preview (_userTableFeatures . _2 . _Just) + foldMap i18nCell . preview (_userTableFeatures . _2 . _Just) colUserDegreeShort :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) colUserDegreeShort = sortable (Just "degree-short") (i18nCell MsgStudyFeatureDegree) $ - foldMap (htmlCell . shortStudyDegree) . preview (_userTableFeatures . _2 . _Just) + foldMap (i18nCell . ShortStudyDegree) . preview (_userTableFeatures . _2 . _Just) makeCourseUserTable :: CourseId -> _ -> _ -> DB Widget makeCourseUserTable cid colChoices psValidator = diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index 21ff05efe..b82d788fa 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -224,7 +224,7 @@ studyFeaturesPrimaryFieldFor oldFeatures mbuid = selectField $ do E.where_ $ ((feature E.^. StudyFeaturesId) `E.in_` E.valList oldFeatures) E.||. isPrimaryActiveUserStudyFeature feature return (feature E.^. StudyFeaturesId, degree, field) - mr <- liftHandler . getMessageRender + MsgRenderer mr <- getMsgRenderer mkOptionList . nonEmptyOptions (mr MsgNoPrimaryStudyField) <$> mapM (procOptions mr) rawOptions where isPrimaryActiveUserStudyFeature feature = case mbuid of @@ -234,7 +234,7 @@ studyFeaturesPrimaryFieldFor oldFeatures mbuid = selectField $ do E.&&. feature E.^. StudyFeaturesType E.==. E.val FieldPrimary procOptions :: (StudyDegreeTerm -> Text) -> (E.Value StudyFeaturesId, Entity StudyDegree, Entity StudyTerms) -> Handler (Option (Maybe StudyFeaturesId)) - procOptions mr (E.Value sfid, Entity dgid sdegree, Entity stid sterm) = do + procOptions mr (E.Value sfid, Entity _dgid sdegree, Entity _stid sterm) = do cfid <- encrypt sfid return Option { optionDisplay = mr $ StudyDegreeTerm sdegree sterm