From 76098cc3c84e1e51cfadc381347aae483d62dbeb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 27 Apr 2020 16:37:39 +0200 Subject: [PATCH] fix(campus): fix corner case with study features results in uglier features (more unnecessary inactive features) --- src/Foundation.hs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index 7aee3ddff..73a223407 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -4716,18 +4716,11 @@ upsertCampusUser plugin ldapData = do oldFs <- selectKeysList ([ StudyFeaturesUser ==. studyFeaturesUser , StudyFeaturesDegree ==. studyFeaturesDegree + , StudyFeaturesField ==. studyFeaturesField , StudyFeaturesType ==. studyFeaturesType , StudyFeaturesSemester ==. studyFeaturesSemester - ] ++ - [ StudyFeaturesField ==. studyFeaturesField - , StudyFeaturesSuperField ==. studyFeaturesSuperField - ] ||. case studyFeaturesSuperField of - Just sField -> - [ StudyFeaturesField ==. sField - , StudyFeaturesSuperField ==. Nothing - ] - Nothing -> [] - ) [] + ]) + [] case oldFs of [oldF] -> update oldF [ StudyFeaturesUpdated =. now