diff --git a/src/Handler/Utils/Qualification.hs b/src/Handler/Utils/Qualification.hs index 83b7dfab0..9fd19c74f 100644 --- a/src/Handler/Utils/Qualification.hs +++ b/src/Handler/Utils/Qualification.hs @@ -108,7 +108,7 @@ qualificationValid = flip validQualification validQualification :: UTCTime -> E.SqlExpr (Entity QualificationUser) -> E.SqlExpr (E.Value Bool) validQualification cutoff qualUser = (E.val (utctDay cutoff) `E.between` (qualUser E.^. QualificationUserFirstHeld - ,qualUser E.^. QualificationUserValidUntil)) -- currently valid + ,qualUser E.^. QualificationUserValidUntil)) -- currently valid E.&&. quserBlock False cutoff qualUser -- | Variant of `validQualification` for outer joins diff --git a/src/Model/Migration/Definitions.hs b/src/Model/Migration/Definitions.hs index 022065a33..ee107a190 100644 --- a/src/Model/Migration/Definitions.hs +++ b/src/Model/Migration/Definitions.hs @@ -864,6 +864,7 @@ customMigrations = mapF $ \case CREATE TABLE "qualification_user_block" ( "id" SERIAL8 PRIMARY KEY UNIQUE , "qualification_user" bigint NOT NULL + , "unblock" boolean NOT NULL , "from" timestamp with time zone NOT NULL , "reason" character varying NOT NULL , "blocker" bigint @@ -874,7 +875,7 @@ customMigrations = mapF $ \case let getBlocks = [queryQQ|SELECT "id", "blocked_due" FROM "qualification_user" WHERE "blocked_due" IS NOT NULL|] migrateBlocks [ fromPersistValue -> Right (quid :: QualificationUserId), fromPersistValue -> Right (Just (Legacy.QualificationBlocked{..} :: Legacy.QualificationBlocked)) ] = - [executeQQ|INSERT INTO "qualification_user_block" ("qualification_user", "from", "reason") VALUES (#{quid}, #{qualificationBlockedDay}, #{qualificationBlockedReason})|] + [executeQQ|INSERT INTO "qualification_user_block" ("qualification_user", "unblock", "from", "reason") VALUES (#{quid}, FALSE, #{qualificationBlockedDay}, #{qualificationBlockedReason})|] migrateBlocks _ = return () in runConduit $ getBlocks .| C.mapM_ migrateBlocks diff --git a/start.sh b/start.sh index f5c21989f..fb7492ae7 100755 --- a/start.sh +++ b/start.sh @@ -28,7 +28,7 @@ export ENCRYPT_ERRORS=${ENCRYPT_ERRORS:-false} export RIBBON=${RIBBON:-${__HOST:-localhost}} export APPROOT=${APPROOT:-http://localhost:$((${PORT_OFFSET:-0} + 3000))} export AVSPASS=${AVSPASS:-nopasswordset} -export PATH=${PATH:/home/jost/projects/fradrive} +export PATH=${PATH:/home/jost/projects/fradrive} export MAIL_REROUTE_TO_NAME='Steffen Jost' export MAIL_REROUTE_TO_EMAIL=jost@tcs.ifi.lmu.de unset HOST